Changeset 6590 for trunk/bp-loader.php

Timestamp:

12/10/2012 10:08:48 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Introduce legacy_constants() method, to handle the setting of old BuddyPress constants that some plugins might still look for. Props ddean. Fixes #4550.

File:

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

trunk/bp-loader.php

@@ -136 +136 @@
             self::$instance->constants();
             self::$instance->setup_globals();
+            self::$instance->legacy_constants();
             self::$instance->includes();
             self::$instance->setup_actions();
@@ -191 +192 @@
 
     /**
-     * Legacy BuddyPress constants
-     *
-     * Try to avoid using these. Their values have been moved into variables
-     * in the $bp global, and have matching functions to get/set their value.
-     *
+     * Bootstrap constants
+     * 
      * @since BuddyPress (1.6)
      *
@@ -205 +203 @@
      */
     private function constants() {
-
-        // Define the BuddyPress version
-        if ( !defined( 'BP_VERSION' ) )
-            define( 'BP_VERSION', $this->version );
-
-        // Define the database version
-        if ( !defined( 'BP_DB_VERSION' ) )
-            define( 'BP_DB_VERSION', $this->db_version );
 
         // Place your custom code (actions/filters) in a file called
@@ -356 +346 @@
         $this->current_user   = new stdClass();
         $this->displayed_user = new stdClass();
+    }
+
+    /**
+     * Legacy BuddyPress constants
+     *
+     * Try to avoid using these. Their values have been moved into variables
+     * in the instance, and have matching functions to get/set their values.
+     *
+     * @since BuddyPress (1.7)
+     */
+    private function legacy_constants() {
+
+        // Define the BuddyPress version
+        if ( !defined( 'BP_VERSION'    ) ) define( 'BP_VERSION',    $this->version   );
+
+        // Define the database version
+        if ( !defined( 'BP_DB_VERSION' ) ) define( 'BP_DB_VERSION', $this->db_version );
     }