Merge branch 'release/150718'

zencache/includes/advanced-cache.tpl.php

@@ -163,13 +163,16 @@
 		 */
 		define('ZENCACHE_PLUGIN_FILE', '%%ZENCACHE_PLUGIN_FILE%%');
 
-	/*
-	 * Include shared methods between {@link advanced_cache} and {@link plugin}.
-	 */
-	if(defined('WP_DEBUG') && WP_DEBUG)
-		require_once dirname(ZENCACHE_PLUGIN_FILE).'/includes/share.php';
-	else if((@require_once(dirname(ZENCACHE_PLUGIN_FILE).'/includes/share.php')) === FALSE)
-		return; // Unable to find class dependency. Fail softly.
+    /*
+     * Include shared methods between {@link advanced_cache} and {@link plugin}.
+     */
+    if (defined('WP_DEBUG') && WP_DEBUG) {
+        if ((include_once(dirname(ZENCACHE_PLUGIN_FILE).'/includes/share.php')) === false) {
+            return;
+        } // Unable to find class dependency. Fail softly.
+    } else if ((@include_once(dirname(ZENCACHE_PLUGIN_FILE).'/includes/share.php')) === false) {
+        return; // Unable to find class dependency. Fail softly.
+    }
 
 	/**
 	 * ZenCache (Advanced Cache Handler)

zencache/includes/menu-pages.php

@@ -688,10 +688,8 @@ public function options()
 				echo '            </select></p>'."\n";
 				echo '         <hr />'."\n";
 
-                echo '         <h3 style="margin-bottom:0;">'.
-                                    '<a href="#" class="dotted" data-toggle-target="'.esc_attr(__NAMESPACE__.'-static-cdn-filters--more-options').'">'.
-                                        __('Additional Options (For Advanced Users)', $this->plugin->text_domain) .
-                                    '</a>'.
+                echo '         <h2 style="margin-bottom:0;font-weight:bold;">'.
+                                        __('Additional Options (For Advanced Users)', $this->plugin->text_domain).
                                 '</h3>'."\n";
 
                 echo '         <div class="'.esc_attr(__NAMESPACE__.'-static-cdn-filters--more-options').'" style="margin-top:1em;">'."\n";

zencache/includes/share.php

@@ -61,7 +61,7 @@ abstract class share // Shared between {@link advanced_cache} and {@link plugin}
 			 *
 			 * @var string Current version of the software.
 			 */
-			public $version = '150709';
+			public $version = '150718';
 
 			/**
 			 * Plugin slug; based on `__NAMESPACE__`.

zencache/readme.txt

@@ -1,6 +1,6 @@
 === ZenCache ===
 
-Stable tag: 150709
+Stable tag: 150718
 Requires at least: 3.7
 Tested up to: 4.3-beta
 Text Domain: zencache
@@ -53,16 +53,21 @@ TIP: you can preview Pro features in the free version by clicking the "Preview P
 
 == Screenshots ==
 
-1. ZenCache Screenshot #1
-2. ZenCache Screenshot #2
-3. ZenCache Screenshot #3
-4. ZenCache Screenshot #4
-5. ZenCache Screenshot #5
-6. ZenCache Screenshot #6
-7. ZenCache Screenshot #7
-8. ZenCache Screenshot #8
-9. ZenCache Screenshot #9
-10. ZenCache Screenshot #10
+1. Step 1: Enable ZenCache #1
+2. Step 2: Save All Changes; that's it! #2
+3. One-click Clear Cache button #3
+4. Intelligent and automatic cache clearing #4
+5. Directory / Expiration Time #5
+6. Client-Side Cache #6
+7. GET Requests #7
+8. 404 Requests #8
+9. RSS, RDF, and Atom Feeds #9
+10. URI Exclusion Patterns #10
+11. HTTP Referrer Exclusion Patterns #11
+12. User-Agent Exclusion Patterns #12
+13. GZIP Compression #13
+14. Theme/Plugin Developers #14
+
 
 == Installation ==
 
@@ -328,6 +333,10 @@ Requires PHP v5.3.2+. The latest version of ZenCache is a complete rewrite (OOP
 
 == Changelog ==
 
+= v150718 =
+
+- **Bug Fix**: Fixed a Fatal Error when upgrading from v150629 to the latest version of ZenCache. This fatal error only occurred on sites that had `WP_DEBUG` enabled, at which point ZenCache failed to properly update `advanced-cache.php`. When `WP_DEBUG` was disabled, the new version of ZenCache was able to properly update `advanced-cache.php` and therefore the temporary failure was silent and inconsequential. This bug fix ensures that no fatal error will be produced when upgrading from v150629, even if `WP_DEBUG` is enabled. See [Issue #524](https://github.com/websharks/zencache/issues/524).
+
 = v150709 =
 
 - **Bug Fix**: This update reverts the codebase restructure released in the previous version (v150626). That release received several reports of Fatal Errors, however those issues only affected a small subset of ZenCache users. After extensive research, we discovered that this issue was related to a bug in PHP's APC Extension (which is commonly used on systems running PHP 5.3 and PHP 5.4). The restructured codebase in the previous release utilized a newer PHP feature (Closures) and that increased the likelihood of exposing that existing PHP bug. Since we can't fix the PHP bug directly and we want to continue supporting PHP 5.3.2+ and PHP 5.4 for now, we're reverting the ZenCache Lite codebase restructure to the previous version (v150409). The new ZenCache Lite features that were included in the previous release are still available in this release--only the structure of the codebase itself has changed. To read more about the PHP APC bug, see [Issue #511](https://github.com/websharks/zencache/issues/511).

zencache/src/includes/functions/wp-cache-postload.php

@@ -0,0 +1,6 @@
+<?php
+/*
+ * Placeholder for backwards compatibility with upgrades from v150629.
+ * See https://github.com/websharks/zencache/issues/524
+ */
+return;

zencache/src/includes/stub.php

@@ -0,0 +1,23 @@
+<?php
+namespace WebSharks\ZenCache;
+/*
+ * Placeholder for backwards compatibility with upgrades from v150629.
+ * See https://github.com/websharks/zencache/issues/524
+ */
+
+define(__NAMESPACE__.'\\GLOBAL_NS', 'zencache');
+define(__NAMESPACE__.'\\IS_PRO', '0');
+
+class AdvCacheBackCompat
+{
+   public static function qcRequestVars()
+   {
+     return;
+   }
+   public static function quickCacheConstants()
+   {
+     return;
+   }
+}
+
+class AdvancedCache{}

zencache/zencache.php

@@ -1,12 +1,12 @@
 <?php
 /*
-Version: 150709
+Version: 150718
 Text Domain: zencache
 Plugin Name: ZenCache
 Network: true
 
-Author: WebSharks, Inc.
-Author URI: http://www.websharks-inc.com/
+Author: ZenCache / WebSharks, Inc.
+Author URI: https://zencache.com/
 
 Plugin URI: http://zencache.com/
 Description: ZenCache is an advanced WordPress caching plugin inspired by simplicity. Speed up your site (BIG time!) with a reliable and fast WordPress cache.