Subscribe2 - Version 10.30.1

Version Description

Download this release

Release Info

Developer Collizo4sky
Plugin Icon 128x128 Subscribe2
Version 10.30.1
Comparing to
See all releases

Code changes from version 10.30 to 10.30.1

Files changed (5) hide show
  1. ChangeLog.txt +6 -0
  2. admin/settings.php +1 -1
  3. classes/class-s2-admin.php +2 -3
  4. classes/class-s2-core.php +5 -0
  5. subscribe2.php +2 -2
ChangeLog.txt CHANGED
@@ -1,3 +1,9 @@
 
 
 
 
 
 
1
  = 10.30 =
2
 
3
  * Code efficiency enhancements
1
+ = 10.30.1 =
2
+
3
+ * Clean unused global variables
4
+ * Implemented compatibility with Fusion Builder
5
+ * Fix error caused by menu registration in WordPress 5.3
6
+
7
  = 10.30 =
8
 
9
  * Code efficiency enhancements
admin/settings.php CHANGED
@@ -3,7 +3,7 @@ if ( ! function_exists( 'add_action' ) ) {
3
  exit();
4
  }
5
 
6
- global $wpdb, $wp_version, $current_tab;
7
 
8
  // was anything POSTed?
9
  if ( isset( $_POST['s2_admin'] ) ) {
3
  exit();
4
  }
5
 
6
+ global $wpdb, $current_tab;
7
 
8
  // was anything POSTed?
9
  if ( isset( $_POST['s2_admin'] ) ) {
classes/class-s2-admin.php CHANGED
@@ -6,9 +6,8 @@ class S2_Admin extends S2_Core {
6
  */
7
  public function admin_menu() {
8
  add_menu_page( __( 'Subscribe2', 'subscribe2' ), __( 'Subscribe2', 'subscribe2' ), apply_filters( 's2_capability', 'read', 'user' ), 's2', null, S2URL . 'include/email-edit.png' );
9
-
10
- $s2user = add_submenu_page( 's2', __( 'Your Subscriptions', 'subscribe2' ), __( 'Your Subscriptions', 'subscribe2' ), apply_filters( 's2_capability', 'read', 'user' ), 's2', array( &$this, 'user_menu' ), S2URL . 'include/email-edit.png' );
11
- add_action( "admin_print_scripts-$s2user", array( &$this, 'checkbox_form_js' ) );
12
  add_action( "admin_print_styles-$s2user", array( &$this, 'user_admin_css' ) );
13
  add_action( 'load-' . $s2user, array( &$this, 'user_help' ) );
14
 
6
  */
7
  public function admin_menu() {
8
  add_menu_page( __( 'Subscribe2', 'subscribe2' ), __( 'Subscribe2', 'subscribe2' ), apply_filters( 's2_capability', 'read', 'user' ), 's2', null, S2URL . 'include/email-edit.png' );
9
+ $s2user = add_submenu_page( 's2', __( 'Your Subscriptions', 'subscribe2' ), __( 'Your Subscriptions', 'subscribe2' ), apply_filters( 's2_capability', 'read', 'user' ), 's2', array( &$this, 'user_menu' ) );
10
+ add_action( "admin_print_scripts-$s2user", array( &$this, 'checkbox_form_js' ) );
 
11
  add_action( "admin_print_styles-$s2user", array( &$this, 'user_admin_css' ) );
12
  add_action( 'load-' . $s2user, array( &$this, 'user_help' ) );
13
 
classes/class-s2-core.php CHANGED
@@ -1915,6 +1915,11 @@ class S2_Core {
1915
  $this->block_editor = true;
1916
  }
1917
 
 
 
 
 
 
1918
  if ( true === $this->block_editor ) {
1919
  require_once S2PATH . 'classes/class-s2-block-editor.php';
1920
  global $mysubscribe2_block_editor;
1915
  $this->block_editor = true;
1916
  }
1917
 
1918
+ // Compatibility with Fusion Builder
1919
+ if ( is_plugin_active( 'fusion-builder/fusion-builder.php' ) && ! isset( $_GET['gutenberg-editor'] ) ) {
1920
+ $this->block_editor = false;
1921
+ }
1922
+
1923
  if ( true === $this->block_editor ) {
1924
  require_once S2PATH . 'classes/class-s2-block-editor.php';
1925
  global $mysubscribe2_block_editor;
subscribe2.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Subscribe2
4
  Plugin URI: https://subscribe2.wordpress.com/
5
  Description: Notifies an email list when new entries are posted.
6
- Version: 10.30
7
  Author: Subscribe2
8
  Author URI: https://subscribe2.wordpress.com/
9
  Licence: GPLv3
@@ -54,7 +54,7 @@ if ( is_plugin_active_for_network( plugin_basename( __FILE__ ) ) ) {
54
 
55
  // our version number. Don't touch this or any line below
56
  // unless you know exactly what you are doing
57
- define( 'S2VERSION', '10.30' );
58
  define( 'S2PATH', trailingslashit( dirname( __FILE__ ) ) );
59
  define( 'S2DIR', trailingslashit( dirname( plugin_basename( __FILE__ ) ) ) );
60
  define( 'S2URL', plugin_dir_url( dirname( __FILE__ ) ) . S2DIR );
3
  Plugin Name: Subscribe2
4
  Plugin URI: https://subscribe2.wordpress.com/
5
  Description: Notifies an email list when new entries are posted.
6
+ Version: 10.30.1
7
  Author: Subscribe2
8
  Author URI: https://subscribe2.wordpress.com/
9
  Licence: GPLv3
54
 
55
  // our version number. Don't touch this or any line below
56
  // unless you know exactly what you are doing
57
+ define( 'S2VERSION', '10.30.1' );
58
  define( 'S2PATH', trailingslashit( dirname( __FILE__ ) ) );
59
  define( 'S2DIR', trailingslashit( dirname( plugin_basename( __FILE__ ) ) ) );
60
  define( 'S2URL', plugin_dir_url( dirname( __FILE__ ) ) . S2DIR );