Skip to content

Commit

Permalink
Switching to Live branch: Prevent code from executing after new code …
Browse files Browse the repository at this point in the history
…has been put in place. (#98)

* Stop actions and hooks from executing when we replace the code and redirect the user back to wp-admin.

* Bump version

* Fix changelog entry
  • Loading branch information
bisko authored Apr 1, 2020
1 parent d246e29 commit 7f9e3a2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.4.3 -- April 1, 2020

- Avoid Fatal errors when switching between branches that might be at different base version of the code.

## 2.4.2 -- January 21, 2020

- Avoid Fatal errors; when Jetpack's vendor directory cannot be found, do not attempt to update.
2 changes: 2 additions & 0 deletions jetpack-beta-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ static function admin_page_load() {
update_option( 'jp_beta_email_notifications', (int) ! $enable_email_notifications );
}
wp_safe_redirect( Jetpack_Beta::admin_url() );

exit();
}

static function is_toggle_action( $option ) {
Expand Down
4 changes: 2 additions & 2 deletions jetpack-beta.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Jetpack Beta Tester
* Plugin URI: https://jetpack.com/beta/
* Description: Use the Beta plugin to get a sneak peek at new features and test them on your site.
* Version: 2.4.2
* Version: 2.4.3
* Author: Automattic
* Author URI: https://jetpack.com/
* License: GPLv2 or later
Expand Down Expand Up @@ -38,7 +38,7 @@
define( 'JPBETA__PLUGIN_FOLDER', basename( dirname( __FILE__ ) ) );
define( 'JPBETA__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'JPBETA__PLUGIN_FILE', __FILE__ );
define( 'JPBETA_VERSION', '2.4.2' );
define( 'JPBETA_VERSION', '2.4.3' );

define( 'JPBETA_DEFAULT_BRANCH', 'rc_only' );

Expand Down

0 comments on commit 7f9e3a2

Please sign in to comment.