diff --git a/.gitattributes b/.gitattributes index be1b039..02c94b5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,6 +22,7 @@ # Server config files. *.admins text *.cfg text +*.cnf text *.conf text *.htaccess text *.htaccess-apache text @@ -31,8 +32,14 @@ # CSS/JavaScript files. *.css text *.js text +*.css.map text +*.js.map text *.json text +# Applescript files. +*.applescript text +*.scpt binary + # PHP scripts/files. *.inc text *.php text @@ -140,4 +147,4 @@ *.dll binary *.exe binary *.sh text -*.so binary \ No newline at end of file +*.so binary diff --git a/.gitignore b/.gitignore index 2b70c04..12e3bd4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,15 @@ *~ *.bak +# Node +node_modules/ +npm-debug.log + +# SASS +.sass-cache/ + # IntelliJ .idea/ -*.iml *.ipr *.iws @@ -49,10 +55,13 @@ Icon? # Amazon Web Services .elasticbeanstalk/ -# For shell glob patterns. This includes GIT files too. We simply maintain this list together with `.gitignore`. -# .~*;*~;*.bak;.idea;*.iml;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;.gitignore;.gitattributes;CVS;.cvsignore;.svn;_svn;.bzr;.bzrignore;.hg;.hgignore;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;.elasticbeanstalk +# Vagrant +.vagrant/ + +# For shell glob patterns. This includes Git files too. We simply maintain this list together with `.gitignore`. +# .~*;*~;*.bak;node_modules;npm-debug.log;.idea;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;.gitignore;.gitattributes;CVS;.cvsignore;.svn;_svn;.bzr;.bzrignore;.hg;.hgignore;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._*;.elasticbeanstalk;.vagrant # This list is for IntelliJ IDEA / PhpStorm `File Types` configuration. Some files we actually WANT to work with as part of a project. -# .idea;*.iml;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;CVS;.svn;_svn;.bzr;.hg;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._* +# .sass-cache;.idea;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;CVS;.svn;_svn;.bzr;.hg;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._*;.vagrant -# We also need to update the WebSharks™ Core `dirs_files::ignore()` method if this changes. \ No newline at end of file +# We also need to update the WebSharks™ Core `dirs_files::ignore()` method if this changes. diff --git a/zencache/includes/advanced-cache.tpl.php b/zencache/includes/advanced-cache.tpl.php index 308743f..5283421 100644 --- a/zencache/includes/advanced-cache.tpl.php +++ b/zencache/includes/advanced-cache.tpl.php @@ -679,8 +679,9 @@ public function maybe_start_output_buffering() if($this->is_uncacheable_request_method()) return $this->maybe_set_debug_info($this::NC_DEBUG_UNCACHEABLE_REQUEST); - if(isset($_SERVER['REMOTE_ADDR'], $_SERVER['SERVER_ADDR']) && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) - if(!$this->is_localhost()) return $this->maybe_set_debug_info($this::NC_DEBUG_SELF_SERVE_REQUEST); + if(isset($_SERVER['SERVER_ADDR']) && $this->current_ip() === $_SERVER['SERVER_ADDR']) + if(!$this->is_localhost()) // Allow for a localhost scenario; i.e., a developer testing. + return $this->maybe_set_debug_info($this::NC_DEBUG_SELF_SERVE_REQUEST); if(!ZENCACHE_FEEDS_ENABLE && $this->is_feed()) return $this->maybe_set_debug_info($this::NC_DEBUG_FEED_REQUEST); @@ -1053,7 +1054,7 @@ public function maybe_get_nc_debug_info($reason_code = '', $reason = '') break; // Break switch handler. case $this::NC_DEBUG_SELF_SERVE_REQUEST: - $reason = __('because `$_SERVER[\'REMOTE_ADDR\']` === `$_SERVER[\'SERVER_ADDR\']`; i.e. a self-serve request. DEVELOPER TIP: if you are testing on a localhost installation, please add `define(\'LOCALHOST\', TRUE);` to your `/wp-config.php` file while you run tests :-) Remove it (or set it to a `FALSE` value) once you go live on the web.', $this->text_domain); + $reason = __('because `[current IP address]` === `$_SERVER[\'SERVER_ADDR\']`; i.e. a self-serve request. DEVELOPER TIP: if you are testing on a localhost installation, please add `define(\'LOCALHOST\', TRUE);` to your `/wp-config.php` file while you run tests :-) Remove it (or set it to a `FALSE` value) once you go live on the web.', $this->text_domain); break; // Break switch handler. case $this::NC_DEBUG_FEED_REQUEST: diff --git a/zencache/includes/menu-pages.php b/zencache/includes/menu-pages.php index 53dc914..8bce4fc 100644 --- a/zencache/includes/menu-pages.php +++ b/zencache/includes/menu-pages.php @@ -531,7 +531,7 @@ public function options() echo ' '."\n"; echo ' '."\n"; echo '
'."\n"; - echo ''.__('Note: This is experimental. Please report issues here.', $this->plugin->text_domain).'
'."\n"; + echo ''.__('Note: This is experimental. Please report issues here.', $this->plugin->text_domain).'
'."\n"; echo '%4$s
; auto-clearing."
msgstr ""
-#: zencache.inc.php:1169
+#: zencache.inc.php:1245
msgid "%1$s: detected changes. Found %2$s in the cache, for XML feeds of type: %3$s
; auto-clearing."
msgstr ""
-#: zencache.inc.php:1212
+#: zencache.inc.php:1288
msgid "%1$s: detected changes. Found %2$s in the cache for XML sitemaps; auto-clearing."
msgstr ""
-#: zencache.inc.php:1255
+#: zencache.inc.php:1331
msgid "%1$s: detected changes. Found %2$s in the cache for the designated \"Home Page\"; auto-clearing."
msgstr ""
-#: zencache.inc.php:1313
+#: zencache.inc.php:1389
msgid "%1$s: detected changes. Found %2$s in the cache for the designated \"Posts Page\"; auto-clearing."
msgstr ""
-#: zencache.inc.php:1368
+#: zencache.inc.php:1444
msgid "Untitled"
msgstr ""
-#: zencache.inc.php:1379
+#: zencache.inc.php:1455
msgid "%1$s: detected changes. Found %2$s in the cache for Custom Post Type: %3$s
; auto-clearing."
msgstr ""
-#: zencache.inc.php:1469
+#: zencache.inc.php:1545
msgid "%1$s: detected changes. Found %2$s in the cache for Author Page: %3$s
; auto-clearing."
msgstr ""
-#: zencache.inc.php:1621
+#: zencache.inc.php:1697
msgid "%1$s: detected changes. Found %2$s in the cache for %3$s: %4$s
; auto-clearing."
msgstr ""
-#: zencache.inc.php:1910 zencache.inc.php:1938
+#: zencache.inc.php:1986 zencache.inc.php:2014
msgid "Doing it wrong! Missing `base_dir` option value. MUST call this method after `setup()`."
msgstr ""
-#: zencache.inc.php:2371
+#: zencache.inc.php:2453
msgid "Lite"
msgstr ""
-#: zencache.inc.php:2372
+#: zencache.inc.php:2454
msgid "Pro"
msgstr ""
-#: zencache.inc.php:2378
+#: zencache.inc.php:2460
msgid "%1$s is NOT running. A conflicting plugin, %2$s, is currently active. Please deactivate the %2$s plugin to clear this message."
msgstr ""
@@ -1343,17 +1382,17 @@ msgid "ZenCache"
msgstr ""
#. Plugin URI of the plugin/theme
-msgid "http://www.websharks-inc.com/product/zencache/"
+msgid "http://zencache.com/"
msgstr ""
#. Description of the plugin/theme
-msgid "WordPress advanced cache plugin; speed without compromise!"
+msgid "ZenCache is an advanced WordPress caching plugin inspired by simplicity. Speed up your site (BIG time!) with a reliable and fast WordPress cache."
msgstr ""
#. Author of the plugin/theme
-msgid "s2Member® / WebSharks, Inc."
+msgid "WebSharks, Inc."
msgstr ""
#. Author URI of the plugin/theme
-msgid "http://www.s2member.com"
+msgid "http://www.websharks-inc.com/"
msgstr ""
diff --git a/zencache/readme.txt b/zencache/readme.txt
index 057a784..0b7df08 100644
--- a/zencache/readme.txt
+++ b/zencache/readme.txt
@@ -1,6 +1,6 @@
=== ZenCache ===
-Stable tag: 150314
+Stable tag: 150409
Requires at least: 3.7
Tested up to: 4.1.1
Text Domain: zencache
@@ -296,7 +296,7 @@ Also, to stay updated with the latest version of ZenCache Pro, be sure to also c
In addition to the [WordPress Requirements](http://wordpress.org/about/requirements/), ZenCache requires the following minimum versions:
-- PHP 5.3+
+- PHP 5.3.2+
- Apache 2.1+
== License ==
@@ -324,10 +324,26 @@ Released under the terms of the [GNU General Public License](http://www.gnu.org/
= v140104 =
-Requires PHP v5.3+. The latest version of ZenCache is a complete rewrite (OOP design). Faster! and even more dependable. NOTE: the free version of Quick Cache (this new LITE version); while it remains fully functional and is more-than-adequate for most sites; is now limited in some ways. The following advanced features from the previous release are no longer available in the lite version: a custom MD5 Version Salt, custom Exclusion Patterns, a Clear Cache button in admin bar. These, and other features; are now available only in the pro version of the plugin. For further details, please see: