Changeset 2716187

Timestamp:

04/28/2022 11:44:42 PM (4 years ago)

Author:

manfcarlo

Message:

v1.3.2

Location:

wp-funnel-manager

Files:

• tags/1.3.2 (copied) (copied from wp-funnel-manager/trunk)
• tags/1.3.2/readme.txt (modified) (3 diffs)
• tags/1.3.2/src/funnel.php (modified) (1 diff)
• tags/1.3.2/wp-funnel-manager.php (modified) (4 diffs)
• trunk/readme.txt (modified) (3 diffs)
• trunk/src/funnel.php (modified) (1 diff)
• trunk/wp-funnel-manager.php (modified) (4 diffs)

wp-funnel-manager/tags/1.3.2/readme.txt

@@ -3 +3 @@
 Tags: funnel builder, page builder, sales funnels, landing page, marketing, sales, block, blocks, block editor, gutenberg, template, templates
 Tested up to: 5.9
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -57 +57 @@
 Once your active theme supports the template editor, all your funnels will be automatically restored.
 
+= Why did the plugin automatically deactivate itself? =
+
+This is a rare issue that the majority of users will never encounter.
+
+WP Funnel Manager requires a core function, [wp_get_current_user](https://developer.wordpress.org/reference/functions/wp_get_current_user/), to be re-defined in a certain way. Only one plugin at a time is allowed to re-define any given core function, [see this article for more explanation.](https://codex.wordpress.org/Pluggable_Functions) Therefore, if it is detected that another plugin is already re-defining this core function in its own way, WP Funnel Manager is unable to operate.
+
+By deactivating your other plugins one by one, and attemping to re-activate WP Funnel Manager, you can determine which one of your other plugins was causing the conflict with WP Funnel Manager. Once you have found it, you will be able to activate WP Funnel Manager and any other plugin not involved in the conflict.
+
 = How do I suggest a new feature or submit a bug report? =
 
@@ -62 +70 @@
 
 == Changelog ==
+
+= 1.3.2 =
+* Fixed the user roles, which were previously not working properly
 
 = 1.3.1 =

wp-funnel-manager/tags/1.3.2/src/funnel.php

@@ -93 +93 @@
         add_filter( 'single_template_hierarchy', array( $this, 'apply_template_to_interior' ) );
         add_action( 'wp_roles_init', array( $this, 'add_role' ) );
+        add_filter( 'after_setup_theme', array( __CLASS__, 'regenerate_roles' ), 11 );
 
         remove_filter( 'page_row_actions', array( $this, 'funnel_interior_edit' ), 10, 2 );
         add_filter( 'post_row_actions', array( $this, 'funnel_interior_edit' ), 10, 2 );
+    }
+
+    public static function regenerate_roles()
+    {
+        $roles = wp_roles();
+        $roles->for_site( $roles->get_site_id() );
     }
 

wp-funnel-manager/tags/1.3.2/wp-funnel-manager.php

@@ -4 +4 @@
  * Plugin URI:
  * Description: Organises content into multi-step funnels.
- * Version: 1.3.1
+ * Version: 1.3.2
  * Requires at least: 5.8
  * Requires PHP: 5.6
@@ -18 +18 @@
 }
 
-if ( false )
+if ( function_exists( 'wp_get_current_user' ) )
 {
     add_action( 'plugins_loaded', 'wpfunnel_init_deactivation' );
@@ -47 +47 @@
     function wpfunnel_deactivation_notice()
     {
-        $notice = sprintf(
-            // Translators: 1: Required PHP version, 2: Current PHP version.
-            '<strong>WP Funnel Manager</strong> requires PHP %1$s to run. This site uses %2$s, so the plugin has been <strong>deactivated</strong>.',
-            '7.1',
-            PHP_VERSION
-        );
+        $notice = '<strong>WP Funnel Manager</strong> has been <strong>deactivated</strong> due to the detection of an unresolvable conflict with another of your plugins. Please try again after deactivating your other plugins.';
         ?>
         <div class="updated"><p><?php echo wp_kses_post( $notice ); ?></p></div>
@@ -64 +59 @@
     return false;
 }
+else
+{
+    function wp_get_current_user()
+    {
+        return did_action( 'after_setup_theme' ) && ! doing_action( 'after_setup_theme' ) ? _wp_get_current_user() : new WP_User( 0, '' );
+    }
+}
 
 /**

wp-funnel-manager/trunk/readme.txt

@@ -3 +3 @@
 Tags: funnel builder, page builder, sales funnels, landing page, marketing, sales, block, blocks, block editor, gutenberg, template, templates
 Tested up to: 5.9
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -57 +57 @@
 Once your active theme supports the template editor, all your funnels will be automatically restored.
 
+= Why did the plugin automatically deactivate itself? =
+
+This is a rare issue that the majority of users will never encounter.
+
+WP Funnel Manager requires a core function, [wp_get_current_user](https://developer.wordpress.org/reference/functions/wp_get_current_user/), to be re-defined in a certain way. Only one plugin at a time is allowed to re-define any given core function, [see this article for more explanation.](https://codex.wordpress.org/Pluggable_Functions) Therefore, if it is detected that another plugin is already re-defining this core function in its own way, WP Funnel Manager is unable to operate.
+
+By deactivating your other plugins one by one, and attemping to re-activate WP Funnel Manager, you can determine which one of your other plugins was causing the conflict with WP Funnel Manager. Once you have found it, you will be able to activate WP Funnel Manager and any other plugin not involved in the conflict.
+
 = How do I suggest a new feature or submit a bug report? =
 
@@ -62 +70 @@
 
 == Changelog ==
+
+= 1.3.2 =
+* Fixed the user roles, which were previously not working properly
 
 = 1.3.1 =

wp-funnel-manager/trunk/src/funnel.php

@@ -93 +93 @@
         add_filter( 'single_template_hierarchy', array( $this, 'apply_template_to_interior' ) );
         add_action( 'wp_roles_init', array( $this, 'add_role' ) );
+        add_filter( 'after_setup_theme', array( __CLASS__, 'regenerate_roles' ), 11 );
 
         remove_filter( 'page_row_actions', array( $this, 'funnel_interior_edit' ), 10, 2 );
         add_filter( 'post_row_actions', array( $this, 'funnel_interior_edit' ), 10, 2 );
+    }
+
+    public static function regenerate_roles()
+    {
+        $roles = wp_roles();
+        $roles->for_site( $roles->get_site_id() );
     }
 

wp-funnel-manager/trunk/wp-funnel-manager.php

@@ -4 +4 @@
  * Plugin URI:
  * Description: Organises content into multi-step funnels.
- * Version: 1.3.1
+ * Version: 1.3.2
  * Requires at least: 5.8
  * Requires PHP: 5.6
@@ -18 +18 @@
 }
 
-if ( false )
+if ( function_exists( 'wp_get_current_user' ) )
 {
     add_action( 'plugins_loaded', 'wpfunnel_init_deactivation' );
@@ -47 +47 @@
     function wpfunnel_deactivation_notice()
     {
-        $notice = sprintf(
-            // Translators: 1: Required PHP version, 2: Current PHP version.
-            '<strong>WP Funnel Manager</strong> requires PHP %1$s to run. This site uses %2$s, so the plugin has been <strong>deactivated</strong>.',
-            '7.1',
-            PHP_VERSION
-        );
+        $notice = '<strong>WP Funnel Manager</strong> has been <strong>deactivated</strong> due to the detection of an unresolvable conflict with another of your plugins. Please try again after deactivating your other plugins.';
         ?>
         <div class="updated"><p><?php echo wp_kses_post( $notice ); ?></p></div>
@@ -64 +59 @@
     return false;
 }
+else
+{
+    function wp_get_current_user()
+    {
+        return did_action( 'after_setup_theme' ) && ! doing_action( 'after_setup_theme' ) ? _wp_get_current_user() : new WP_User( 0, '' );
+    }
+}
 
 /**