Changeset 3947 for trunk/bp-core/bp-core-catchuri.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-catchuri.php (modified) (3 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -27 +27 @@
  */
 function bp_core_set_uri_globals() {
-    global $bp, $bp_pages;
-    global $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
+    global $bp, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
     global $current_blog;
 
@@ -43 +42 @@
 
     // Fetch all the WP page names for each component
-    if ( empty( $bp_pages ) )
-        $bp_pages = bp_core_get_page_names();
+    if ( empty( $bp->pages ) )
+        $bp->pages = bp_core_get_page_names();
 
     // Ajax or not?
@@ -119 +118 @@
 
     // Find a match within registered BuddyPress controlled WP pages (check members first)
-    foreach ( (array)$bp_pages as $page_key => $bp_page ) {
+    foreach ( (array)$bp->pages as $page_key => $bp_page ) {
         if ( in_array( $bp_page->name, (array)$bp_uri ) ) {
             // Match found, now match the slug to make sure.