Merge pull request #681 from BoldGrid/fix-ga-switch

Fix GA switch for development
BoldGrid · May 3, 2023 · 5704291 · 5704291
2 parents aa609bb + 1e9cf60
commit 5704291
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Extension_ImageService_Plugin_Admin.php b/Extension_ImageService_Plugin_Admin.php
@@ -572,7 +572,7 @@ public function admin_enqueue_scripts() {
 					),
 					'tos_choice'  => Licensing_Core::get_tos_choice(),
 					'track_usage' => $this->config->get_boolean( 'common.track_usage' ),
-					'ga_profile'  => ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) ? 'UA-2264433-7' : 'UA-2264433-8',
+					'ga_profile'  => ( defined( 'W3TC_DEVELOPER' ) && W3TC_DEVELOPER ) ? 'UA-2264433-7' : 'UA-2264433-8',
 					'settings'    => $this->config->get_array( 'imageservice' ),
 					'settingsUrl' => esc_url( Util_Ui::admin_url( 'upload.php?page=w3tc_extension_page_imageservice' ) ),
 				)

diff --git a/Generic_Plugin_Admin.php b/Generic_Plugin_Admin.php
@@ -435,7 +435,7 @@ public function admin_head() {
 				$page = 'extensions/' . Util_Request::get_string( 'extension' );
 			}
 
-			if ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) {
+			if ( defined( 'W3TC_DEVELOPER' ) && W3TC_DEVELOPER ) {
 				$profile = 'UA-2264433-7';
 			} else {
 				$profile = 'UA-2264433-8';

diff --git a/SetupGuide_Plugin_Admin.php b/SetupGuide_Plugin_Admin.php
@@ -889,7 +889,7 @@ private function get_config() {
 							'install_version'   => esc_attr( $state->get_string( 'common.install_version' ) ),
 							'w3tc_edition'      => esc_attr( Util_Environment::w3tc_edition( $config ) ),
 							'list_widgets'      => esc_attr( Util_Widget::list_widgets() ),
-							'ga_profile'        => ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) ? 'UA-2264433-7' : 'UA-2264433-8',
+							'ga_profile'        => ( defined( 'W3TC_DEVELOPER' ) && W3TC_DEVELOPER ) ? 'UA-2264433-7' : 'UA-2264433-8',
 							'tos_choice'        => Licensing_Core::get_tos_choice(),
 							'track_usage'       => $config->get_boolean( 'common.track_usage' ),
 							'test_complete_msg' => __(

diff --git a/qa/env/scripts/init-box/800-w3tc.sh b/qa/env/scripts/init-box/800-w3tc.sh
@@ -5,6 +5,7 @@ echo "alias w3test=\"/share/scripts/w3test \"" >> /root/.bash_aliases
 # ask w3tc to use debug GA profile
 cd $W3D_WP_PATH
 sed -i '2idefine( \"W3TC_DEBUG\", true );' wp-config.php
+sed -i '2idefine( \"W3TC_DEVELOPER\", true );' wp-config.php
 
 # backup before w3tc
 /share/scripts/w3tc-umount.sh