Changeset 7346

Timestamp:

08/12/2013 09:56:33 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Switch main BuddyPress singleton pointer from a private static to a local static inside the instance() method, preventing recursive $instance references. See ​#BB2370.

File:

• trunk/bp-loader.php (modified) (3 diffs)

trunk/bp-loader.php

@@ -107 +107 @@
 
     /**
-     * @var BuddyPress The one true BuddyPress
-     */
-    private static $instance;
-
-    /**
      * Main BuddyPress Instance
      *
@@ -123 +118 @@
      * @since BuddyPress (1.7)
      *
-     * @staticvar array $instance
+     * @staticvar object $instance
      * @uses BuddyPress::constants() Setup the constants (mostly deprecated)
      * @uses BuddyPress::setup_globals() Setup the globals needed
+     * @uses BuddyPress::legacy_constants() Setup the legacy constants (deprecated)
      * @uses BuddyPress::includes() Include the required files
      * @uses BuddyPress::setup_actions() Setup the hooks and actions
@@ -133 +129 @@
      */
     public static function instance() {
-        if ( ! isset( self::$instance ) ) {
-            self::$instance = new BuddyPress;
-            self::$instance->constants();
-            self::$instance->setup_globals();
-            self::$instance->legacy_constants();
-            self::$instance->includes();
-            self::$instance->setup_actions();
+
+        // Store the instance locally to avoid private static replication
+        static $instance = null;
+
+        // Only run these methods if they haven't been ran previously
+        if ( null === $instance ) {
+            $instance = new BuddyPress;
+            $instance->constants();
+            $instance->setup_globals();
+            $instance->legacy_constants();
+            $instance->includes();
+            $instance->setup_actions();
         }
-        return self::$instance;
+
+        // Always return the instance
+        return $instance;
     }