Changeset 5320

Timestamp:

11/09/2011 06:54:53 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Move $bp_no_status_set global into $bp global, and more improvements to bp-core-catchuri.php.

Location:

trunk

Files:

• bp-core/bp-core-catchuri.php (modified) (5 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)

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

@@ -400 +400 @@
  */
 function bp_core_catch_profile_uri() {
-        global $bp;
-
-        if ( !bp_is_active( 'xprofile' ) )
+        if ( !bp_is_active( 'xprofile' ) ) {
                 bp_core_load_template( apply_filters( 'bp_core_template_display_profile', 'members/single/home' ) );
+        }
 }
 
@@ -413 +412 @@
  */
 function bp_core_catch_no_access() {
-        global $bp, $bp_no_status_set, $wp_query;
-
-        // If bp_core_redirect() and $bp_no_status_set is true,
-        // we are redirecting to an accessible page, so skip this check.
-        if ( $bp_no_status_set )
+        global $bp, $wp_query;
+
+        // If coming from bp_core_redirect() and $bp_no_status_set is true,
+        // we are redirecting to an accessible page so skip this check.
+        if ( !empty( $bp->no_status_set ) )
                 return false;
 
@@ -435 +434 @@
  */
 function bp_core_no_access( $args = '' ) {
-        global $bp;
 
         $defaults = array(
@@ -441 +439 @@
                 'message'  => __( 'You must log in to access the page you requested.', 'buddypress' ),
                 'redirect' => wp_guess_url(),   // the URL you get redirected to when a user successfully logs in
-                'root'     => $bp->root_domain  // the landing page you get redirected to when a user doesn't have access
+                'root'     => bp_get_root_domain()      // the landing page you get redirected to when a user doesn't have access
         );
 
         $r = wp_parse_args( $args, $defaults );
+        $r = apply_filters_ref_array( 'bp_core_no_access', $r );
         extract( $r, EXTR_SKIP );
 
-        // Apply filters to these variables
+        /**
+         * @ignore Ignore these filters and use 'bp_core_no_access' above
+         */
         $mode           = apply_filters( 'bp_no_access_mode',     $mode,     $root,     $redirect, $message );
         $redirect       = apply_filters( 'bp_no_access_redirect', $redirect, $root,     $message,  $mode    );
@@ -470 +471 @@
                 case 1 :
                 default :
-                        if ( $redirect ) {
+
+                        $url = $root;
+                        if ( !empty( $redirect ) )
                                 $url = add_query_arg( 'redirect_to', urlencode( $redirect ), $root );
-                        } else {
-                                $url = $root;
-                        }
-
-                        if ( $message ) {
+
+                        if ( !empty( $message ) ) {
                                 bp_core_add_message( $message, 'error' );
                         }

trunk/bp-core/bp-core-functions.php

@@ -831 +831 @@
  *
  * @package BuddyPress Core
- * @global $bp_no_status_set Makes sure that there are no conflicts with status_header() called in bp_core_do_catch_uri()
- * @uses get_themes()
- * @return An array containing all of the themes.
+ * @global BuddyPress $bp Makes sure that there are no conflicts with
+ *                         status_header() called in bp_core_do_catch_uri()
+ * @uses wp_redirect()
  */
 function bp_core_redirect( $location, $status = 302 ) {
-        global $bp_no_status_set;
+        global $bp;
 
         // Make sure we don't call status_header() in bp_core_do_catch_uri()
         // as this conflicts with wp_redirect()
-        $bp_no_status_set = true;
+        $bp->no_status_set = true;
 
         wp_redirect( $location, $status );

trunk/bp-loader.php

@@ -155 +155 @@
          */
         public $unfiltered_uri_offset = 0;
-        
+
+        /**
+         * @var bool Are status headers already sent?
+         */
+        public $no_status_set = false;
+
         /** Components ************************************************************/