Changeset 9471 for trunk/src/bp-core/bp-core-catchuri.php

Timestamp:

02/10/2015 02:49:16 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

• trunk/src/bp-core/bp-core-catchuri.php (modified) (7 diffs)

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

@@ -34 +34 @@
  */
 function bp_core_set_uri_globals() {
-    global $bp, $current_blog, $wp_rewrite;
+    global $current_blog, $wp_rewrite;
 
     // Don't catch URIs on non-root blogs unless multiblog mode is on
     if ( !bp_is_root_blog() && !bp_is_multiblog_mode() )
         return false;
+
+    $bp = buddypress();
 
     // Define local variables
@@ -419 +421 @@
  */
 function bp_core_catch_no_access() {
-    global $bp, $wp_query;
+    global $wp_query;
+
+    $bp = buddypress();
 
     // If coming from bp_core_redirect() and $bp_no_status_set is true,
@@ -550 +554 @@
  */
 function bp_redirect_canonical() {
-    global $bp;
 
     if ( !bp_is_blog_page() && apply_filters( 'bp_do_redirect_canonical', true ) ) {
@@ -574 +577 @@
         if ( $canonical_url !== $req_url_clean ) {
 
+            $bp = buddypress();
+
             // Template messages have been deleted from the cookie by this point, so
             // they must be readded before redirecting
@@ -619 +624 @@
  */
 function bp_get_canonical_url( $args = array() ) {
-    global $bp;
 
     // For non-BP content, return the requested url, and let WP do the work
@@ -625 +629 @@
         return bp_get_requested_url();
     }
+
+    $bp = buddypress();
 
     $defaults = array(
@@ -701 +707 @@
  */
 function bp_get_requested_url() {
-    global $bp;
+    $bp = buddypress();
 
     if ( empty( $bp->canonical_stack['requested_url'] ) ) {