Changeset 5235 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

10/11/2011 02:05:35 PM (15 years ago)

Author:

boonebgorges

Message:

Moves bp_core_is_user_spammer() 404 check from bp_core_catch_no_access() to bp_core_set_uri_globals(), to ensure that it's run in time to 404 for non-super-admins. Fixes #3666

File:

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

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

@@ -251 +251 @@
                                 }
 
+                                // If the displayed user is marked as a spammer, 404 (unless logged-
+                                // in user is a super admin)
+                                if ( !empty( $bp->displayed_user->id ) && bp_core_is_user_spammer( $bp->displayed_user->id ) ) {
+                                        if ( is_super_admin() ) {
+                                                bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'error' );
+                                        } else {
+                                                bp_do_404();
+                                                return;
+                                        }
+                                }
+
                                 // Bump the offset
                                 if ( isset( $bp_uri[$uri_offset + 2] ) ) {
@@ -368 +379 @@
         if ( $bp_no_status_set )
                 return false;
-
-        // If the displayed user was marked as a spammer and the logged-in user is not a super admin, 404.
-        if ( isset( $bp->displayed_user->id ) && bp_core_is_user_spammer( $bp->displayed_user->id ) ) {
-                if ( !$bp->loggedin_user->is_super_admin ) {
-                        bp_do_404();
-                        return;
-
-                } else {
-                        bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'error' );
-                }
-        }
 
         if ( !isset( $wp_query->queried_object ) && !bp_is_blog_page() ) {