Changeset 3947 for trunk/bp-core/bp-core-loader.php

Timestamp:

01/27/2011 06:42:12 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Move $bp_pages global into $bp->pages global. Check empty() on table_prefix, root_domain, and site_options to allow manual overrides.

File:

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

trunk/bp-core/bp-core-loader.php

@@ -35 +35 @@
 
     function _setup_globals() {
-        global $bp, $bp_pages;
+        global $bp;
+
+        /** Database **********************************************************/
 
         // Get the base database prefix
-        $bp->table_prefix = bp_core_get_table_prefix();
+        if ( empty( $bp->table_prefix ) )
+            $bp->table_prefix = bp_core_get_table_prefix();
 
         // The domain for the root of the site where the main blog resides
-        $bp->root_domain  = bp_core_get_root_domain();
+        if ( empty( $bp->root_domain ) )
+            $bp->root_domain = bp_core_get_root_domain();
+
+        // Fetches all of the core BuddyPress settings in one fell swoop
+        if ( empty( $bp->site_options ) )
+            $bp->site_options = bp_core_get_site_options();
 
         // The names of the core WordPress pages used to display BuddyPress content
-        $bp->pages        = $bp_pages;
+        if ( empty( $bp->pages ) )
+            $bp->pages = bp_core_get_page_names();
 
-        /** Component and Action **************************************************/
+        /** Component and Action **********************************************/
 
         // Used for overriding the 2nd level navigation menu so it can be used to
@@ -63 +72 @@
         }
 
-        // Fetches all of the core BuddyPress settings in one fell swoop
-        $bp->site_options = bp_core_get_site_options();
-
         // Sets up the array container for the component navigation rendered
         // by bp_get_nav()
@@ -78 +84 @@
         $bp->active_components = array();
 
-        /** Basic current user data ***********************************************/
+        /** Basic current user data *******************************************/
 
         // Logged in user is the 'current_user'
@@ -86 +92 @@
         $bp->loggedin_user->id   = $current_user->ID;
 
-        /** Avatars ***************************************************************/
+        /** Avatars ***********************************************************/
 
         // Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar