Changeset 8582

Timestamp:

07/10/2014 06:51:21 PM (12 years ago)

Author:

johnjamesjacoby

Message:

More strict conditions to avoid debug notices when removing sign-ups from users queries. Also add some brackets and inline doc while we're poking around.

File:

• trunk/src/bp-members/bp-members-admin.php (modified) (1 diff)

trunk/src/bp-members/bp-members-admin.php

@@ -1131 +1131 @@
 
         // Bail if this is an ajax request
-        if ( defined( 'DOING_AJAX' ) )
+        if ( defined( 'DOING_AJAX' ) ) {
             return;
-
+        }
+
+        // Bail if updating BuddyPress
         if ( bp_is_update() ) {
             return;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        // Bail if there is no current admin screen
+        if ( ! function_exists( 'get_current_screen' ) || ! get_current_screen() ) {
             return;
         }
 
-        if ( $this->users_page != get_current_screen()->id ) {
+        // Bail if not on a users page
+        if ( $this->users_page !== get_current_screen()->id ) {
             return;
         }
 
+        // Bail if already querying by an existing role
         if ( ! empty( $query->query_vars['role'] ) ) {
             return;