Ticket #6872: 6872.03.patch

src/bp-members/classes/class-bp-members-admin.php

@@ -1324 +1324 @@
          * @return array The views with the signup view added.
          */
         public function signup_filter_view( $views = array() ) {
+                global $role;
 
                 // Remove the 'current' class from All if we're on the signups view.
-                if ( $this->signups_page == get_current_screen()->id ) {
+                if ( 'registered' === $role ) {
                         $views['all'] = str_replace( 'class="current"', '', $views['all'] );
                         $class        = 'current';
                 } else {

src/bp-members/classes/class-bp-members-list-table.php

@@ -37 +37 @@
                         'ajax'     => false,
                         'plural'   => 'signups',
                         'singular' => 'signup',
-                        'screen'   => buddypress()->members->admin->users_screen,
+                        'screen'   => get_current_screen()->id,
                 ) );
         }
 
@@ -84 +84 @@
         }
 
         /**
-         * Get the views (the links above the WP List Table).
+         * Display the users screen views
          *
-         * @since 2.0.0
+         * @since 2.5.0
          *
-         * @uses WP_Users_List_Table::get_views() to get the users views.
+         * @global string $role The name of role the users screens is filtered by
          */
-        public function get_views() {
-                return parent::get_views();
+        public function views() {
+                global $role;
+
+                // Used to reset the role
+                $reset_role = $role;
+
+                // Temporarly set the role to registered
+                $role = 'registered';
+
+                // Used to reset the screen id once views are displayed
+                $reset_screen_id = $this->screen->id;
+
+                // Temporarly set the screen id to the users one
+                $this->screen->id = buddypress()->members->admin->users_screen;
+
+                // Use the parent function so that other plugins can safely add views
+                parent::views();
+
+                // Reset the role
+                $role = $reset_role;
+
+                // Reset the screen id
+                $this->screen->id = $reset_screen_id;
         }
 
         /**

src/bp-members/classes/class-bp-members-ms-list-table.php

@@ -37 +37 @@
                         'ajax'     => false,
                         'plural'   => 'signups',
                         'singular' => 'signup',
-                        'screen'   => buddypress()->members->admin->users_screen,
+                        'screen'   => get_current_screen()->id,
                 ) );
         }
 
@@ -85 +85 @@
         }
 
         /**
-         * Get the views : the links above the WP List Table.
+         * Display the users screen views
          *
-         * @since 2.0.0
+         * @since 2.5.0
          *
-         * @uses WP_MS_Users_List_Table::get_views() to get the users views.
+         * @global string $role The name of role the users screens is filtered by
          */
-        public function get_views() {
-                return parent::get_views();
+        public function views() {
+                global $role;
+
+                // Used to reset the role
+                $reset_role = $role;
+
+                // Temporarly set the role to registered
+                $role = 'registered';
+
+                // Used to reset the screen id once views are displayed
+                $reset_screen_id = $this->screen->id;
+
+                // Temporarly set the screen id to the users one
+                $this->screen->id = buddypress()->members->admin->users_screen;
+
+                // Use the parent function so that other plugins can safely add views
+                parent::views();
+
+                // Reset the role
+                $role = $reset_role;
+
+                // Reset the screen id
+                $this->screen->id = $reset_screen_id;
         }
 
         /**