W3 Total Cache - Version 2.0.1

Version Description

  • Fix: Corrected redirection logic for the new Setup Guide
  • Fix: Fixed JavaScript w3tc_ga error
Download this release

Release Info

Developer joemoto
Plugin Icon 128x128 W3 Total Cache
Version 2.0.1
Comparing to
See all releases

Code changes from version 2.0.0 to 2.0.1

Files changed (7) hide show
  1. Generic_Plugin_Admin.php +6 -4
  2. SetupGuide_Plugin_Admin.php +1 -0
  3. pub/css/wizard.css +4 -0
  4. pub/js/setup-guide.js +4 -2
  5. readme.txt +5 -1
  6. w3-total-cache-api.php +1 -1
  7. w3-total-cache.php +1 -1
Generic_Plugin_Admin.php CHANGED
@@ -255,10 +255,12 @@ class Generic_Plugin_Admin {
255
  $config = new Config();
256
  $state_master = Dispatcher::config_state_master();
257
 
258
- if ( is_multisite() ) {
259
- wp_redirect( esc_url( network_admin_url( 'admin.php?page=w3tc_setup_guide' ) ) );
260
- } else {
261
- wp_redirect( esc_url( admin_url( 'admin.php?page=w3tc_setup_guide' ) ) );
 
 
262
  }
263
  }
264
 
255
  $config = new Config();
256
  $state_master = Dispatcher::config_state_master();
257
 
258
+ if ( ! $config->get_boolean( 'pgcache.enabled' ) && $state_master->get_integer( 'common.install' ) > strtotime( 'NOW - 1 WEEK' ) ) {
259
+ if ( is_multisite() ) {
260
+ wp_redirect( esc_url( network_admin_url( 'admin.php?page=w3tc_setup_guide' ) ) );
261
+ } else {
262
+ wp_redirect( esc_url( admin_url( 'admin.php?page=w3tc_setup_guide' ) ) );
263
+ }
264
  }
265
  }
266
 
SetupGuide_Plugin_Admin.php CHANGED
@@ -908,6 +908,7 @@ class SetupGuide_Plugin_Admin {
908
  'list_widgets' => esc_attr( Util_Widget::list_widgets() ),
909
  'ga_profile' => ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) ? 'UA-2264433-7' : 'UA-2264433-8',
910
  'tos_choice' => $this->get_tos_choice(),
 
911
  'test_complete_msg' => __(
912
  'Testing complete. Click Next to advance to the section and see the results.',
913
  'w3-total-cache'
908
  'list_widgets' => esc_attr( Util_Widget::list_widgets() ),
909
  'ga_profile' => ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) ? 'UA-2264433-7' : 'UA-2264433-8',
910
  'tos_choice' => $this->get_tos_choice(),
911
+ 'track_usage' => $config->get_boolean( 'common.track_usage' ),
912
  'test_complete_msg' => __(
913
  'Testing complete. Click Next to advance to the section and see the results.',
914
  'w3-total-cache'
pub/css/wizard.css CHANGED
@@ -131,6 +131,10 @@ ul#w3tc-options-menu {
131
  padding-left: 160px;
132
  }
133
 
 
 
 
 
134
  /* Spinner */
135
  .spinner.inline {
136
  float: none;
131
  padding-left: 160px;
132
  }
133
 
134
+ .w3tc-overlay {
135
+ display: none;
136
+ }
137
+
138
  /* Spinner */
139
  .spinner.inline {
140
  float: none;
pub/js/setup-guide.js CHANGED
@@ -8,13 +8,15 @@
8
  * @global W3TC-setup-guide Localized array variable.
9
  */
10
 
 
 
11
  jQuery(function() {
12
  var $container = jQuery( '#w3tc-wizard-container'),
13
  $nextButton = $container.find( '#w3tc-wizard-next '),
14
  $tosNotice = $container.find( '#w3tc-licensing-terms' );
15
 
16
  // GA.
17
- if ( 'accept' === W3TC_SetupGuide.tos_choice ) {
18
  w3tc_ga( 'create', W3TC_SetupGuide.ga_profile, 'auto' );
19
  w3tc_ga( 'send', 'event', 'button', 'w3tc_setup_guide', 'w3tc-wizard-step-welcome' );
20
  }
@@ -397,7 +399,7 @@ function w3tc_wizard_actions( $slide ) {
397
  }
398
 
399
  // GA.
400
- if ( 'accept' === W3TC_SetupGuide.tos_choice ) {
401
  w3tc_ga( 'send', 'event', 'button', 'w3tc_setup_guide', slideId );
402
  }
403
 
8
  * @global W3TC-setup-guide Localized array variable.
9
  */
10
 
11
+ var w3tc_enable_ga = ( 'accept' === W3TC_SetupGuide.tos_choice && W3TC_SetupGuide.track_usage && window.w3tc_ga );
12
+
13
  jQuery(function() {
14
  var $container = jQuery( '#w3tc-wizard-container'),
15
  $nextButton = $container.find( '#w3tc-wizard-next '),
16
  $tosNotice = $container.find( '#w3tc-licensing-terms' );
17
 
18
  // GA.
19
+ if ( w3tc_enable_ga ) {
20
  w3tc_ga( 'create', W3TC_SetupGuide.ga_profile, 'auto' );
21
  w3tc_ga( 'send', 'event', 'button', 'w3tc_setup_guide', 'w3tc-wizard-step-welcome' );
22
  }
399
  }
400
 
401
  // GA.
402
+ if ( w3tc_enable_ga ) {
403
  w3tc_ga( 'send', 'event', 'button', 'w3tc_setup_guide', slideId );
404
  }
405
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: boldgrid, fredericktownes, maxicusc, gidomanders, bwmarkle, harryj
3
  Tags: seo, cache, optimize, pagespeed, performance, caching, compression, maxcdn, nginx, varnish, redis, new relic, aws, amazon web services, s3, cloudfront, rackspace, cloudflare, azure, apache
4
  Requires at least: 3.2
5
  Tested up to: 5.6
6
- Stable tag: 2.0.0
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -275,6 +275,10 @@ Please reach out to all of these people and support their projects if you're so
275
 
276
  == Changelog ==
277
 
 
 
 
 
278
  = 2.0.0 =
279
  * Feature: Added the Setup Guide wizard for onboarding
280
  * Update: Updated jQuery compatibility and methods deprecated in WordPress 5.6
3
  Tags: seo, cache, optimize, pagespeed, performance, caching, compression, maxcdn, nginx, varnish, redis, new relic, aws, amazon web services, s3, cloudfront, rackspace, cloudflare, azure, apache
4
  Requires at least: 3.2
5
  Tested up to: 5.6
6
+ Stable tag: 2.0.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
275
 
276
  == Changelog ==
277
 
278
+ = 2.0.1 =
279
+ * Fix: Corrected redirection logic for the new Setup Guide
280
+ * Fix: Fixed JavaScript w3tc_ga error
281
+
282
  = 2.0.0 =
283
  * Feature: Added the Setup Guide wizard for onboarding
284
  * Update: Updated jQuery compatibility and methods deprecated in WordPress 5.6
w3-total-cache-api.php CHANGED
@@ -5,7 +5,7 @@ if ( !defined( 'ABSPATH' ) ) {
5
  }
6
 
7
  define( 'W3TC', true );
8
- define( 'W3TC_VERSION', '2.0.0' );
9
  define( 'W3TC_POWERED_BY', 'W3 Total Cache' );
10
  define( 'W3TC_EMAIL', 'w3tc@w3-edge.com' );
11
  define( 'W3TC_TEXT_DOMAIN', 'w3-total-cache' );
5
  }
6
 
7
  define( 'W3TC', true );
8
+ define( 'W3TC_VERSION', '2.0.1' );
9
  define( 'W3TC_POWERED_BY', 'W3 Total Cache' );
10
  define( 'W3TC_EMAIL', 'w3tc@w3-edge.com' );
11
  define( 'W3TC_TEXT_DOMAIN', 'w3-total-cache' );
w3-total-cache.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: W3 Total Cache
4
  * Plugin URI: https://www.boldgrid.com/totalcache/
5
  * Description: The highest rated and most complete WordPress performance plugin. Dramatically improve the speed and user experience of your site. Add browser, page, object and database caching as well as minify and content delivery network (CDN) to WordPress.
6
- * Version: 2.0.0
7
  * Requires at least: 3.2
8
  * Requires PHP: 5.3
9
  * Author: BoldGrid
3
  * Plugin Name: W3 Total Cache
4
  * Plugin URI: https://www.boldgrid.com/totalcache/
5
  * Description: The highest rated and most complete WordPress performance plugin. Dramatically improve the speed and user experience of your site. Add browser, page, object and database caching as well as minify and content delivery network (CDN) to WordPress.
6
+ * Version: 2.0.1
7
  * Requires at least: 3.2
8
  * Requires PHP: 5.3
9
  * Author: BoldGrid