Changeset 3127526
- Timestamp:
- 07/29/2024 03:01:30 PM (20 months ago)
- Location:
- grow-for-wp
- Files:
-
- 38 added
- 38 deleted
- 24 edited
- 1 copied
-
tags/1.5.0 (copied) (copied from grow-for-wp/trunk)
-
tags/1.5.0/assets/dist/admin.1.4.1.css (deleted)
-
tags/1.5.0/assets/dist/admin.1.4.1.js (deleted)
-
tags/1.5.0/assets/dist/admin.1.5.0.css (added)
-
tags/1.5.0/assets/dist/admin.1.5.0.js (added)
-
tags/1.5.0/assets/dist/feature-bookmarks.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-bookmarks.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-convertkit.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-convertkit.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-exclusive-content.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-exclusive-content.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-header-carousel.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-header-carousel.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-inline-recommended-content.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-inline-recommended-content.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-mailchimp.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-mailchimp.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-mailerlite.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-mailerlite.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-main-menu.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-main-menu.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-recipe-integration.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-recipe-integration.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-search.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-search.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-spotlight.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-spotlight.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-whats-next.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-whats-next.1.5.0.png (added)
-
tags/1.5.0/assets/dist/feature-zapier.1.4.1.png (deleted)
-
tags/1.5.0/assets/dist/feature-zapier.1.5.0.png (added)
-
tags/1.5.0/assets/dist/icon-check.1.4.1.svg (deleted)
-
tags/1.5.0/assets/dist/icon-check.1.5.0.svg (added)
-
tags/1.5.0/assets/dist/icon-error.1.4.1.svg (deleted)
-
tags/1.5.0/assets/dist/icon-error.1.5.0.svg (added)
-
tags/1.5.0/assets/dist/journey-logo.1.4.1.svg (deleted)
-
tags/1.5.0/assets/dist/journey-logo.1.5.0.svg (added)
-
tags/1.5.0/assets/dist/journey-success-bg.1.4.1.svg (deleted)
-
tags/1.5.0/assets/dist/journey-success-bg.1.5.0.svg (added)
-
tags/1.5.0/grow-for-wp.php (modified) (1 diff)
-
tags/1.5.0/inc/Grow/AdsTxt.php (modified) (1 diff)
-
tags/1.5.0/inc/Grow/Options.php (modified) (1 diff)
-
tags/1.5.0/inc/Grow/OptionsInterface.php (modified) (1 diff)
-
tags/1.5.0/inc/Grow/Pages/AdminPage.php (modified) (1 diff)
-
tags/1.5.0/inc/Grow/Pages/JourneyConfirm.php (modified) (6 diffs)
-
tags/1.5.0/inc/Grow/Plugin.php (modified) (1 diff)
-
tags/1.5.0/readme.txt (modified) (2 diffs)
-
tags/1.5.0/vendor/autoload.php (modified) (1 diff)
-
tags/1.5.0/vendor/composer/autoload_real.php (modified) (3 diffs)
-
tags/1.5.0/vendor/composer/autoload_static.php (modified) (2 diffs)
-
tags/1.5.0/vendor/composer/installed.php (modified) (2 diffs)
-
trunk/assets/dist/admin.1.4.1.css (deleted)
-
trunk/assets/dist/admin.1.4.1.js (deleted)
-
trunk/assets/dist/admin.1.5.0.css (added)
-
trunk/assets/dist/admin.1.5.0.js (added)
-
trunk/assets/dist/feature-bookmarks.1.4.1.png (deleted)
-
trunk/assets/dist/feature-bookmarks.1.5.0.png (added)
-
trunk/assets/dist/feature-convertkit.1.4.1.png (deleted)
-
trunk/assets/dist/feature-convertkit.1.5.0.png (added)
-
trunk/assets/dist/feature-exclusive-content.1.4.1.png (deleted)
-
trunk/assets/dist/feature-exclusive-content.1.5.0.png (added)
-
trunk/assets/dist/feature-header-carousel.1.4.1.png (deleted)
-
trunk/assets/dist/feature-header-carousel.1.5.0.png (added)
-
trunk/assets/dist/feature-inline-recommended-content.1.4.1.png (deleted)
-
trunk/assets/dist/feature-inline-recommended-content.1.5.0.png (added)
-
trunk/assets/dist/feature-mailchimp.1.4.1.png (deleted)
-
trunk/assets/dist/feature-mailchimp.1.5.0.png (added)
-
trunk/assets/dist/feature-mailerlite.1.4.1.png (deleted)
-
trunk/assets/dist/feature-mailerlite.1.5.0.png (added)
-
trunk/assets/dist/feature-main-menu.1.4.1.png (deleted)
-
trunk/assets/dist/feature-main-menu.1.5.0.png (added)
-
trunk/assets/dist/feature-recipe-integration.1.4.1.png (deleted)
-
trunk/assets/dist/feature-recipe-integration.1.5.0.png (added)
-
trunk/assets/dist/feature-search.1.4.1.png (deleted)
-
trunk/assets/dist/feature-search.1.5.0.png (added)
-
trunk/assets/dist/feature-spotlight.1.4.1.png (deleted)
-
trunk/assets/dist/feature-spotlight.1.5.0.png (added)
-
trunk/assets/dist/feature-whats-next.1.4.1.png (deleted)
-
trunk/assets/dist/feature-whats-next.1.5.0.png (added)
-
trunk/assets/dist/feature-zapier.1.4.1.png (deleted)
-
trunk/assets/dist/feature-zapier.1.5.0.png (added)
-
trunk/assets/dist/icon-check.1.4.1.svg (deleted)
-
trunk/assets/dist/icon-check.1.5.0.svg (added)
-
trunk/assets/dist/icon-error.1.4.1.svg (deleted)
-
trunk/assets/dist/icon-error.1.5.0.svg (added)
-
trunk/assets/dist/journey-logo.1.4.1.svg (deleted)
-
trunk/assets/dist/journey-logo.1.5.0.svg (added)
-
trunk/assets/dist/journey-success-bg.1.4.1.svg (deleted)
-
trunk/assets/dist/journey-success-bg.1.5.0.svg (added)
-
trunk/grow-for-wp.php (modified) (1 diff)
-
trunk/inc/Grow/AdsTxt.php (modified) (1 diff)
-
trunk/inc/Grow/Options.php (modified) (1 diff)
-
trunk/inc/Grow/OptionsInterface.php (modified) (1 diff)
-
trunk/inc/Grow/Pages/AdminPage.php (modified) (1 diff)
-
trunk/inc/Grow/Pages/JourneyConfirm.php (modified) (6 diffs)
-
trunk/inc/Grow/Plugin.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/vendor/autoload.php (modified) (1 diff)
-
trunk/vendor/composer/autoload_real.php (modified) (3 diffs)
-
trunk/vendor/composer/autoload_static.php (modified) (2 diffs)
-
trunk/vendor/composer/installed.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
grow-for-wp/tags/1.5.0/grow-for-wp.php
r3110568 r3127526 4 4 * Plugin URI: https://grow.me/publishers 5 5 * Description: Integrate your WordPress Site with Grow 6 * Version: 1. 4.16 * Version: 1.5.0 7 7 * Requires at least: 5.2 8 8 * Requires PHP: 7.4 -
grow-for-wp/tags/1.5.0/inc/Grow/AdsTxt.php
r3075901 r3127526 431 431 432 432 /** 433 * Removes the /ads.txt redirect from the Redirection plugin if it exists. 434 * 435 * @param string $target_url Destination URL for a redirect. 436 * @param string $source_url Matched URL that triggers redirect. 437 * @return bool|string False if source is /ads.txt. Initial target if no match. 438 */ 439 public function remove_redirection_ads_txt( $target_url, $source_url ) { 440 if ( '/ads.txt' === $source_url ) { 441 $target_url = false; 442 } 443 444 return $target_url; 445 } 446 447 /** 433 448 * Defines a helper method to save cached ads.txt method to DB and property. 434 449 * -
grow-for-wp/tags/1.5.0/inc/Grow/Options.php
r3067787 r3127526 195 195 196 196 /** 197 * @param string $default the default value to get if the property is empty 198 * @param bool $force check the database again even if we have a value in memory 199 * 200 * @return string 201 */ 202 public function get_grow_show_need_connection_message( string $default = '', bool $force = false ): string { 203 return strval( $this->get( 'grow_show_need_connection_message', $default, $force ) ); 204 } 205 206 /** 207 * @param string $value New value to set 208 * 209 * @return bool 210 */ 211 public function set_grow_show_need_connection_message( string $value ): bool { 212 return $this->set( 'grow_show_need_connection_message', $value ); 213 } 214 215 /** 197 216 * @param string $key Key for the option to set 198 217 * @param string $value New value to set -
grow-for-wp/tags/1.5.0/inc/Grow/OptionsInterface.php
r3067787 r3127526 156 156 */ 157 157 public function set_grow_ads_txt_redirect_check_in_progress( string $value ): bool; 158 159 /** 160 * Gets the flag that determines whether the need connection message should be shown. 161 * 162 * @param string $default the default value to get if the property is empty 163 * @param bool $force check the database again even if we have a value in memory 164 * 165 * @return string 166 */ 167 public function get_grow_show_need_connection_message( string $default = '', bool $force = false ): string; 168 169 /** 170 * @param string $value New value to set 171 * 172 * @return bool 173 */ 174 public function set_grow_show_need_connection_message( string $value ): bool; 158 175 } -
grow-for-wp/tags/1.5.0/inc/Grow/Pages/AdminPage.php
r3067787 r3127526 78 78 $this->view_loader = $repository->get_view_loader(); 79 79 $this->version = $repository->get_config()->get_version(); 80 81 if ( ! empty( $repository->get_options()->get_grow_show_need_connection_message() ) ) { 82 $this->actions[] = new HookArguments( 'admin_notices', 'output_grow_need_connection_message' ); 83 $repository->get_options()->set_grow_show_need_connection_message( '' ); 84 } 85 } 86 87 /** 88 * Output the admin message to prompt user to connect to Grow. 89 * 90 * @return void 91 */ 92 public function output_grow_need_connection_message() { 93 $message = __( 'Your site must be connected to Grow to access that functionality. Please connect to Grow using the button below and then try again.', 'grow-for-wp' ); 94 printf( '<div class="notice notice-error notice-grow"><p><strong>%1$s</strong></p></div>', esc_html( $message ) ); 80 95 } 81 96 -
grow-for-wp/tags/1.5.0/inc/Grow/Pages/JourneyConfirm.php
r3075901 r3127526 46 46 new HookArguments( 'wp_ajax_grow_journey_disable', 'handle_journey_disable' ), 47 47 new HookArguments( 'wp_ajax_grow_journey_troubleshoot', 'handle_journey_troubleshoot' ), 48 new HookArguments( 'load-admin_page_grow-journey-enable', 'redirect_on_missing_site_uuid' ), 49 new HookArguments( 'load-admin_page_grow-journey-disable', 'redirect_on_missing_site_uuid' ), 50 new HookArguments( 'load-admin_page_grow-journey-troubleshoot', 'redirect_on_missing_site_uuid' ), 48 51 ]; 49 52 $this->filters = [ … … 67 70 68 71 /** 72 * Ensure site UUID is available before attempting to load pages. 73 * 74 * @return void 75 */ 76 public function redirect_on_missing_site_uuid() { 77 $page_slug = strtolower( strval( filter_input( INPUT_GET, 'page', FILTER_SANITIZE_STRING ) ) ); 78 $pages = [ 'grow-journey-enable', 'grow-journey-disable', 'grow-journey-troubleshoot' ]; 79 80 if ( ! in_array( $page_slug, $pages, true ) ) { 81 return; 82 } 83 84 if ( ! empty( $this->grow_site_uuid ) ) { 85 return; 86 } 87 88 // Redirect to landing admin page if install is missing required values. 89 $this->options->set_grow_show_need_connection_message( '1' ); 90 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit 91 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) ); 92 if ( ! defined( 'GROW_TEST_MODE' ) ) { 93 exit; 94 } 95 } 96 97 /** 69 98 * Register the custom Page 70 99 * … … 101 130 */ 102 131 public function render_enable() { 103 // Redirect to landing admin page if install is missing required values.104 if ( empty( $this->grow_site_uuid ) ) {105 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit106 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) );107 if ( ! defined( 'GROW_TEST_MODE' ) ) {108 exit;109 }110 return;111 }112 113 132 //phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped 114 133 echo WordPress::wp_kses( $this->view_loader->get_view( 'journey-confirm-enable-view.php', $this->get_enable_view_args() ), $this->view_loader->get_allowed_tags() ); … … 167 186 */ 168 187 public function render_disable() { 169 // Redirect to landing admin page if install is missing required values.170 if ( empty( $this->grow_site_uuid ) ) {171 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit172 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) );173 if ( ! defined( 'GROW_TEST_MODE' ) ) {174 exit;175 }176 return;177 }178 179 188 //phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped 180 189 echo WordPress::wp_kses( $this->view_loader->get_view( 'journey-confirm-disable-view.php', $this->get_disable_view_args() ), $this->view_loader->get_allowed_tags() ); … … 229 238 */ 230 239 public function render_troubleshoot() { 231 // Redirect to landing admin page if install is missing required values.232 if ( empty( $this->grow_site_uuid ) ) {233 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit234 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) );235 if ( ! defined( 'GROW_TEST_MODE' ) ) {236 exit;237 }238 return;239 }240 241 240 //phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped 242 241 echo WordPress::wp_kses( $this->view_loader->get_view( 'journey-confirm-troubleshoot-view.php', $this->get_troubleshoot_view_args() ), $this->view_loader->get_allowed_tags() ); … … 285 284 ], 286 285 ]; 286 287 287 } 288 288 -
grow-for-wp/tags/1.5.0/inc/Grow/Plugin.php
r3110568 r3127526 17 17 18 18 /** @var string|null VERSION */ 19 const VERSION = '1. 4.1';19 const VERSION = '1.5.0'; 20 20 21 21 /** @var Repository */ -
grow-for-wp/tags/1.5.0/readme.txt
r3110568 r3127526 3 3 Tags: social, sharing, grow, subscribe 4 4 Requires at least: 5.2 5 Tested up to: 6. 5.35 Tested up to: 6.6 6 6 Requires PHP: 7.4 7 Stable tag: 1. 4.17 Stable tag: 1.5.0 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 105 105 # Changelog 106 106 107 ## 1.5.0 - 2024-07-16 108 - Fix issues with blank page appearing when attempting to enable Journey. 109 - Fix issues with Redirection plugin when Journey is enabled. 110 107 111 ## 1.4.1 - 2024-06-24 108 112 - Fix issue with duplicate Journey ad slots with newer versions of Create by Mediavine. -
grow-for-wp/tags/1.5.0/vendor/autoload.php
r3110568 r3127526 5 5 require_once __DIR__ . '/composer/autoload_real.php'; 6 6 7 return ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a::getLoader();7 return ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68::getLoader(); -
grow-for-wp/tags/1.5.0/vendor/composer/autoload_real.php
r3110568 r3127526 3 3 // autoload_real.php @generated by Composer 4 4 5 class ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a5 class ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68 6 6 { 7 7 private static $loader; … … 23 23 } 24 24 25 spl_autoload_register(array('ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a', 'loadClassLoader'), true, true);25 spl_autoload_register(array('ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68', 'loadClassLoader'), true, true); 26 26 self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); 27 spl_autoload_unregister(array('ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a', 'loadClassLoader'));27 spl_autoload_unregister(array('ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68', 'loadClassLoader')); 28 28 29 29 $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); … … 31 31 require __DIR__ . '/autoload_static.php'; 32 32 33 call_user_func(\Composer\Autoload\ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::getInitializer($loader));33 call_user_func(\Composer\Autoload\ComposerStaticInitdb839a57e1ae44b76063965de8059a68::getInitializer($loader)); 34 34 } else { 35 35 $map = require __DIR__ . '/autoload_namespaces.php'; -
grow-for-wp/tags/1.5.0/vendor/composer/autoload_static.php
r3110568 r3127526 5 5 namespace Composer\Autoload; 6 6 7 class ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a7 class ComposerStaticInitdb839a57e1ae44b76063965de8059a68 8 8 { 9 9 public static $prefixLengthsPsr4 = array ( … … 86 86 { 87 87 return \Closure::bind(function () use ($loader) { 88 $loader->prefixLengthsPsr4 = ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::$prefixLengthsPsr4;89 $loader->prefixDirsPsr4 = ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::$prefixDirsPsr4;90 $loader->classMap = ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::$classMap;88 $loader->prefixLengthsPsr4 = ComposerStaticInitdb839a57e1ae44b76063965de8059a68::$prefixLengthsPsr4; 89 $loader->prefixDirsPsr4 = ComposerStaticInitdb839a57e1ae44b76063965de8059a68::$prefixDirsPsr4; 90 $loader->classMap = ComposerStaticInitdb839a57e1ae44b76063965de8059a68::$classMap; 91 91 92 92 }, null, ClassLoader::class); -
grow-for-wp/tags/1.5.0/vendor/composer/installed.php
r3110568 r3127526 6 6 'install_path' => __DIR__ . '/../../', 7 7 'aliases' => array(), 8 'reference' => ' 0f592776c2c7cc819e03f251861687d6d4202868',8 'reference' => '4f741ace06ae41619f59165520d1ead3412daf4f', 9 9 'name' => 'mediavine/grow', 10 10 'dev' => false, … … 17 17 'install_path' => __DIR__ . '/../../', 18 18 'aliases' => array(), 19 'reference' => ' 0f592776c2c7cc819e03f251861687d6d4202868',19 'reference' => '4f741ace06ae41619f59165520d1ead3412daf4f', 20 20 'dev_requirement' => false, 21 21 ), -
grow-for-wp/trunk/grow-for-wp.php
r3110568 r3127526 4 4 * Plugin URI: https://grow.me/publishers 5 5 * Description: Integrate your WordPress Site with Grow 6 * Version: 1. 4.16 * Version: 1.5.0 7 7 * Requires at least: 5.2 8 8 * Requires PHP: 7.4 -
grow-for-wp/trunk/inc/Grow/AdsTxt.php
r3075901 r3127526 431 431 432 432 /** 433 * Removes the /ads.txt redirect from the Redirection plugin if it exists. 434 * 435 * @param string $target_url Destination URL for a redirect. 436 * @param string $source_url Matched URL that triggers redirect. 437 * @return bool|string False if source is /ads.txt. Initial target if no match. 438 */ 439 public function remove_redirection_ads_txt( $target_url, $source_url ) { 440 if ( '/ads.txt' === $source_url ) { 441 $target_url = false; 442 } 443 444 return $target_url; 445 } 446 447 /** 433 448 * Defines a helper method to save cached ads.txt method to DB and property. 434 449 * -
grow-for-wp/trunk/inc/Grow/Options.php
r3067787 r3127526 195 195 196 196 /** 197 * @param string $default the default value to get if the property is empty 198 * @param bool $force check the database again even if we have a value in memory 199 * 200 * @return string 201 */ 202 public function get_grow_show_need_connection_message( string $default = '', bool $force = false ): string { 203 return strval( $this->get( 'grow_show_need_connection_message', $default, $force ) ); 204 } 205 206 /** 207 * @param string $value New value to set 208 * 209 * @return bool 210 */ 211 public function set_grow_show_need_connection_message( string $value ): bool { 212 return $this->set( 'grow_show_need_connection_message', $value ); 213 } 214 215 /** 197 216 * @param string $key Key for the option to set 198 217 * @param string $value New value to set -
grow-for-wp/trunk/inc/Grow/OptionsInterface.php
r3067787 r3127526 156 156 */ 157 157 public function set_grow_ads_txt_redirect_check_in_progress( string $value ): bool; 158 159 /** 160 * Gets the flag that determines whether the need connection message should be shown. 161 * 162 * @param string $default the default value to get if the property is empty 163 * @param bool $force check the database again even if we have a value in memory 164 * 165 * @return string 166 */ 167 public function get_grow_show_need_connection_message( string $default = '', bool $force = false ): string; 168 169 /** 170 * @param string $value New value to set 171 * 172 * @return bool 173 */ 174 public function set_grow_show_need_connection_message( string $value ): bool; 158 175 } -
grow-for-wp/trunk/inc/Grow/Pages/AdminPage.php
r3067787 r3127526 78 78 $this->view_loader = $repository->get_view_loader(); 79 79 $this->version = $repository->get_config()->get_version(); 80 81 if ( ! empty( $repository->get_options()->get_grow_show_need_connection_message() ) ) { 82 $this->actions[] = new HookArguments( 'admin_notices', 'output_grow_need_connection_message' ); 83 $repository->get_options()->set_grow_show_need_connection_message( '' ); 84 } 85 } 86 87 /** 88 * Output the admin message to prompt user to connect to Grow. 89 * 90 * @return void 91 */ 92 public function output_grow_need_connection_message() { 93 $message = __( 'Your site must be connected to Grow to access that functionality. Please connect to Grow using the button below and then try again.', 'grow-for-wp' ); 94 printf( '<div class="notice notice-error notice-grow"><p><strong>%1$s</strong></p></div>', esc_html( $message ) ); 80 95 } 81 96 -
grow-for-wp/trunk/inc/Grow/Pages/JourneyConfirm.php
r3075901 r3127526 46 46 new HookArguments( 'wp_ajax_grow_journey_disable', 'handle_journey_disable' ), 47 47 new HookArguments( 'wp_ajax_grow_journey_troubleshoot', 'handle_journey_troubleshoot' ), 48 new HookArguments( 'load-admin_page_grow-journey-enable', 'redirect_on_missing_site_uuid' ), 49 new HookArguments( 'load-admin_page_grow-journey-disable', 'redirect_on_missing_site_uuid' ), 50 new HookArguments( 'load-admin_page_grow-journey-troubleshoot', 'redirect_on_missing_site_uuid' ), 48 51 ]; 49 52 $this->filters = [ … … 67 70 68 71 /** 72 * Ensure site UUID is available before attempting to load pages. 73 * 74 * @return void 75 */ 76 public function redirect_on_missing_site_uuid() { 77 $page_slug = strtolower( strval( filter_input( INPUT_GET, 'page', FILTER_SANITIZE_STRING ) ) ); 78 $pages = [ 'grow-journey-enable', 'grow-journey-disable', 'grow-journey-troubleshoot' ]; 79 80 if ( ! in_array( $page_slug, $pages, true ) ) { 81 return; 82 } 83 84 if ( ! empty( $this->grow_site_uuid ) ) { 85 return; 86 } 87 88 // Redirect to landing admin page if install is missing required values. 89 $this->options->set_grow_show_need_connection_message( '1' ); 90 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit 91 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) ); 92 if ( ! defined( 'GROW_TEST_MODE' ) ) { 93 exit; 94 } 95 } 96 97 /** 69 98 * Register the custom Page 70 99 * … … 101 130 */ 102 131 public function render_enable() { 103 // Redirect to landing admin page if install is missing required values.104 if ( empty( $this->grow_site_uuid ) ) {105 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit106 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) );107 if ( ! defined( 'GROW_TEST_MODE' ) ) {108 exit;109 }110 return;111 }112 113 132 //phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped 114 133 echo WordPress::wp_kses( $this->view_loader->get_view( 'journey-confirm-enable-view.php', $this->get_enable_view_args() ), $this->view_loader->get_allowed_tags() ); … … 167 186 */ 168 187 public function render_disable() { 169 // Redirect to landing admin page if install is missing required values.170 if ( empty( $this->grow_site_uuid ) ) {171 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit172 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) );173 if ( ! defined( 'GROW_TEST_MODE' ) ) {174 exit;175 }176 return;177 }178 179 188 //phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped 180 189 echo WordPress::wp_kses( $this->view_loader->get_view( 'journey-confirm-disable-view.php', $this->get_disable_view_args() ), $this->view_loader->get_allowed_tags() ); … … 229 238 */ 230 239 public function render_troubleshoot() { 231 // Redirect to landing admin page if install is missing required values.232 if ( empty( $this->grow_site_uuid ) ) {233 //phpcs:disable WordPressVIPMinimum.Security.ExitAfterRedirect.NoExit234 WordPress::wp_safe_redirect( WordPress::esc_url( WordPress::admin_url( 'admin.php?page=' . AdminPage::MENU_SLUG ) ) );235 if ( ! defined( 'GROW_TEST_MODE' ) ) {236 exit;237 }238 return;239 }240 241 240 //phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped 242 241 echo WordPress::wp_kses( $this->view_loader->get_view( 'journey-confirm-troubleshoot-view.php', $this->get_troubleshoot_view_args() ), $this->view_loader->get_allowed_tags() ); … … 285 284 ], 286 285 ]; 286 287 287 } 288 288 -
grow-for-wp/trunk/inc/Grow/Plugin.php
r3110568 r3127526 17 17 18 18 /** @var string|null VERSION */ 19 const VERSION = '1. 4.1';19 const VERSION = '1.5.0'; 20 20 21 21 /** @var Repository */ -
grow-for-wp/trunk/readme.txt
r3110568 r3127526 3 3 Tags: social, sharing, grow, subscribe 4 4 Requires at least: 5.2 5 Tested up to: 6. 5.35 Tested up to: 6.6 6 6 Requires PHP: 7.4 7 Stable tag: 1. 4.17 Stable tag: 1.5.0 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 105 105 # Changelog 106 106 107 ## 1.5.0 - 2024-07-16 108 - Fix issues with blank page appearing when attempting to enable Journey. 109 - Fix issues with Redirection plugin when Journey is enabled. 110 107 111 ## 1.4.1 - 2024-06-24 108 112 - Fix issue with duplicate Journey ad slots with newer versions of Create by Mediavine. -
grow-for-wp/trunk/vendor/autoload.php
r3110568 r3127526 5 5 require_once __DIR__ . '/composer/autoload_real.php'; 6 6 7 return ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a::getLoader();7 return ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68::getLoader(); -
grow-for-wp/trunk/vendor/composer/autoload_real.php
r3110568 r3127526 3 3 // autoload_real.php @generated by Composer 4 4 5 class ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a5 class ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68 6 6 { 7 7 private static $loader; … … 23 23 } 24 24 25 spl_autoload_register(array('ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a', 'loadClassLoader'), true, true);25 spl_autoload_register(array('ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68', 'loadClassLoader'), true, true); 26 26 self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); 27 spl_autoload_unregister(array('ComposerAutoloaderInit f22f6d7f73597ad7b4b1c0d67befee3a', 'loadClassLoader'));27 spl_autoload_unregister(array('ComposerAutoloaderInitdb839a57e1ae44b76063965de8059a68', 'loadClassLoader')); 28 28 29 29 $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); … … 31 31 require __DIR__ . '/autoload_static.php'; 32 32 33 call_user_func(\Composer\Autoload\ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::getInitializer($loader));33 call_user_func(\Composer\Autoload\ComposerStaticInitdb839a57e1ae44b76063965de8059a68::getInitializer($loader)); 34 34 } else { 35 35 $map = require __DIR__ . '/autoload_namespaces.php'; -
grow-for-wp/trunk/vendor/composer/autoload_static.php
r3110568 r3127526 5 5 namespace Composer\Autoload; 6 6 7 class ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a7 class ComposerStaticInitdb839a57e1ae44b76063965de8059a68 8 8 { 9 9 public static $prefixLengthsPsr4 = array ( … … 86 86 { 87 87 return \Closure::bind(function () use ($loader) { 88 $loader->prefixLengthsPsr4 = ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::$prefixLengthsPsr4;89 $loader->prefixDirsPsr4 = ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::$prefixDirsPsr4;90 $loader->classMap = ComposerStaticInit f22f6d7f73597ad7b4b1c0d67befee3a::$classMap;88 $loader->prefixLengthsPsr4 = ComposerStaticInitdb839a57e1ae44b76063965de8059a68::$prefixLengthsPsr4; 89 $loader->prefixDirsPsr4 = ComposerStaticInitdb839a57e1ae44b76063965de8059a68::$prefixDirsPsr4; 90 $loader->classMap = ComposerStaticInitdb839a57e1ae44b76063965de8059a68::$classMap; 91 91 92 92 }, null, ClassLoader::class); -
grow-for-wp/trunk/vendor/composer/installed.php
r3110568 r3127526 6 6 'install_path' => __DIR__ . '/../../', 7 7 'aliases' => array(), 8 'reference' => ' 0f592776c2c7cc819e03f251861687d6d4202868',8 'reference' => '4f741ace06ae41619f59165520d1ead3412daf4f', 9 9 'name' => 'mediavine/grow', 10 10 'dev' => false, … … 17 17 'install_path' => __DIR__ . '/../../', 18 18 'aliases' => array(), 19 'reference' => ' 0f592776c2c7cc819e03f251861687d6d4202868',19 'reference' => '4f741ace06ae41619f59165520d1ead3412daf4f', 20 20 'dev_requirement' => false, 21 21 ),
Note: See TracChangeset
for help on using the changeset viewer.