Merge pull request Freemius#284 from Freemius/develop

[start] [essentials] [bug-fix]
matczar · Nov 28, 2018 · 4dab832 · 4dab832
2 parents 553553d + b4f03f9
commit 4dab832
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 34 deletions.
diff --git a/includes/fs-essential-functions.php b/includes/fs-essential-functions.php
@@ -36,39 +36,7 @@ function fs_normalize_path( $path ) {
 		}
 	}
 
-	if ( ! function_exists( 'fs_get_plugins' ) ) {
-        /**
-         * @author Leo Fajardo (@leorw)
-         * @since 2.2.1
-         *
-         * @param bool $delete_cache
-         *
-         * @return array
-         */
-	    function fs_get_plugins( $delete_cache = false ) {
-            $cached_plugins = wp_cache_get( 'plugins', 'plugins' );
-            if ( ! is_array( $cached_plugins ) ) {
-                $cached_plugins = array();
-            }
-
-            $plugin_folder = '';
-            if ( isset( $cached_plugins[ $plugin_folder ] ) ) {
-                $plugins = $cached_plugins[ $plugin_folder ];
-            } else {
-                if ( ! function_exists( 'get_plugins' ) ) {
-                    require_once ABSPATH . 'wp-admin/includes/plugin.php';
-                }
-
-                $plugins = get_plugins();
-
-                if ( $delete_cache && is_plugin_active( 'woocommerce/woocommerce.php' ) ) {
-                    wp_cache_delete( 'plugins', 'plugins' );
-                }
-            }
-
-            return $plugins;
-        }
-	}
+    require_once dirname( __FILE__ ) . '/supplements/fs-essential-functions-2.2.1.php';
 
 	#region Core Redirect (copied from BuddyPress) -----------------------------------------
 

diff --git a/includes/supplements/fs-essential-functions-2.2.1.php b/includes/supplements/fs-essential-functions-2.2.1.php
@@ -0,0 +1,45 @@
+<?php
+    /**
+     * @package     Freemius
+     * @copyright   Copyright (c) 2015, Freemius, Inc.
+     * @license     https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License Version 3
+     * @since       2.2.1
+     */
+
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
+    if ( ! function_exists( 'fs_get_plugins' ) ) {
+        /**
+         * @author Leo Fajardo (@leorw)
+         * @since 2.2.1
+         *
+         * @param bool $delete_cache
+         *
+         * @return array
+         */
+        function fs_get_plugins( $delete_cache = false ) {
+            $cached_plugins = wp_cache_get( 'plugins', 'plugins' );
+            if ( ! is_array( $cached_plugins ) ) {
+                $cached_plugins = array();
+            }
+
+            $plugin_folder = '';
+            if ( isset( $cached_plugins[ $plugin_folder ] ) ) {
+                $plugins = $cached_plugins[ $plugin_folder ];
+            } else {
+                if ( ! function_exists( 'get_plugins' ) ) {
+                    require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                }
+
+                $plugins = get_plugins();
+
+                if ( $delete_cache && is_plugin_active( 'woocommerce/woocommerce.php' ) ) {
+                    wp_cache_delete( 'plugins', 'plugins' );
+                }
+            }
+
+            return $plugins;
+        }
+    }
diff --git a/start.php b/start.php
@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '2.2.1';
+	$this_sdk_version = '2.2.2';
 
 	#region SDK Selection Logic --------------------------------------------------------------------
 
@@ -120,6 +120,10 @@
 		require_once dirname( __FILE__ ) . '/includes/supplements/fs-essential-functions-1.1.7.1.php';
 	}
 
+	if ( ! function_exists( 'fs_get_plugins' ) ) {
+		require_once dirname( __FILE__ ) . '/includes/supplements/fs-essential-functions-2.2.1.php';
+	}
+
 	// Update current SDK info based on the SDK path.
 	if ( ! isset( $fs_active_plugins->plugins[ $this_sdk_relative_path ] ) ||
 	     $this_sdk_version != $fs_active_plugins->plugins[ $this_sdk_relative_path ]->version