Improved the support for plugins with free and premium versions that can be activated in parallel.

Author: fajardoleo

includes/class-freemius.php

@@ -7407,6 +7407,11 @@ function _activate_plugin_event_hook() {
                     $this->apply_filters( 'deactivate_on_activation', true )
                 ) {
                     deactivate_plugins( $other_version_basename );
+                } else if ( $is_premium_version_activation ) {
+                    /**
+                     * To prevent the free version from loading before the premium version when both are active, remove the SDK reference associated with the free version if it's the newest.
+                     */
+                    fs_remove_sdk_reference_by_basename( $other_version_basename );
                 }
             }
 
@@ -8202,16 +8207,7 @@ function _deactivate_plugin_hook() {
          * @since  1.1.6
          */
         private function remove_sdk_reference() {
-            global $fs_active_plugins;
-
-            foreach ( $fs_active_plugins->plugins as $sdk_path => $data ) {
-                if ( $this->_plugin_basename == $data->plugin_path ) {
-                    unset( $fs_active_plugins->plugins[ $sdk_path ] );
-                    break;
-                }
-            }
-
-            fs_fallback_to_newest_active_sdk();
+            fs_remove_sdk_reference_by_basename( $this->_plugin_basename );
         }
 
         /**

includes/fs-essential-functions.php

@@ -415,4 +415,25 @@ function fs_fallback_to_newest_active_sdk() {
                 fs_update_sdk_newest_version( $newest_sdk_path, $newest_sdk_data->plugin_path );
             }
         }
+    }
+
+    if ( ! function_exists( 'fs_remove_sdk_reference_by_basename' ) ) {
+        /**
+         * @author Leo Fajardo (@leorw)
+         * @since 2.7.4
+         *
+         * @param string $plugin_basename
+         */
+        function fs_remove_sdk_reference_by_basename( $plugin_basename ) {
+            global $fs_active_plugins;
+
+            foreach ( $fs_active_plugins->plugins as $sdk_path => $data ) {
+                if ( $plugin_basename == $data->plugin_path ) {
+                    unset( $fs_active_plugins->plugins[ $sdk_path ] );
+                    break;
+                }
+            }
+
+            fs_fallback_to_newest_active_sdk();
+        }
     }

start.php

@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '2.7.3.5';
+	$this_sdk_version = '2.7.3.6';
 
 	#region SDK Selection Logic --------------------------------------------------------------------