Ticket #4550: 4550.02.patch

bp-loader.php

@@ -135 +135 @@
                         self::$instance = new BuddyPress;
                         self::$instance->constants();
                         self::$instance->setup_globals();
+                        self::$instance->legacy_constants();
                         self::$instance->includes();
                         self::$instance->setup_actions();
                 }
@@ -190 +191 @@
         /** Private Methods *******************************************************/
 
         /**
-         * 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)
          *
          * @uses is_multisite()
@@ -205 +204 @@
          */
         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
                 // '/plugins/bp-custom.php' and it will be loaded before anything else.
                 if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
@@ -359 +350 @@
         }
 
         /**
+         * 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.
+         *
+         */
+        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 );
+
+        }
+
+        /**
          * Include required files
          *
          * @since BuddyPress (1.6)