Ticket #6371: 6371.03.patch

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

@@ -482 +482 @@
 
                 // Remove the 'current' class from the 'All' link.
                 $views['all']        = str_replace( 'class="current"', '', $views['all'] );
-                $views['registered'] = sprintf( '<a href="%1$s" class="current">%2$s</a>', esc_url( add_query_arg( 'page', 'bp-signups', bp_get_admin_url( 'users.php' ) ) ), sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $this->signup_counts ) . ')</span>' ) );
+                $views['registered'] = sprintf( '<a href="%1$s" class="current">%2$s</a>', esc_url( add_query_arg( 'page', 'bp-signups', network_admin_url( 'users.php' ) ) ), sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $this->signup_counts ) . ')</span>' ) );
 
                 return $views;
         }
@@ -646 +646 @@
                                 'signup_id' => $signup_object->id,
                                 'action'    => 'resend',
                         ),
-                        bp_get_admin_url( 'users.php' )
+                        network_admin_url( 'users.php' )
                 );
 
                 // Activate link.
@@ -656 +656 @@
                                 'signup_id' => $signup_object->id,
                                 'action'    => 'activate',
                         ),
-                        bp_get_admin_url( 'users.php' )
+                        network_admin_url( 'users.php' )
                 );
 
                 // Delete link.
@@ -666 +666 @@
                                 'signup_id' => $signup_object->id,
                                 'action'    => 'delete',
                         ),
-                        bp_get_admin_url( 'users.php' )
+                        network_admin_url( 'users.php' )
                 );
 
                 echo $avatar . sprintf( '<strong><a href="%1$s" class="edit" title="%2$s">%3$s</a></strong><br/>', esc_url( $activate_link ), esc_attr__( 'Activate', 'buddypress' ), $signup_object->user_login );

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

@@ -202 +202 @@
 
                         // Reorganise the views navigation in users.php and signups page.
                         if ( current_user_can( $this->capability ) ) {
-                                add_filter( "views_{$this->users_screen}", array( $this, 'signup_filter_view'    ), 10, 1 );
-                                add_filter( 'set-screen-option',           array( $this, 'signup_screen_options' ), 10, 3 );
+                                $user_screen = $this->users_screen;
+
+                                /**
+                                 * Users screen on multiblog is users, but signups
+                                 * need to be managed in the network for this case
+                                 */
+                                if ( bp_is_network_activated() && bp_is_multiblog_mode() && false === strpos( $user_screen, '-network' ) ) {
+                                        $user_screen .= '-network';
+                                }
+
+                                add_filter( "views_{$user_screen}", array( $this, 'signup_filter_view'    ), 10, 1 );
+                                add_filter( 'set-screen-option',    array( $this, 'signup_screen_options' ), 10, 3 );
                         }
                 }
         }
@@ -1324 +1334 @@
                 }
 
                 $signups = BP_Signup::count_signups();
-                $url     = add_query_arg( 'page', 'bp-signups', bp_get_admin_url( 'users.php' ) );
+
+                if ( is_network_admin() ) {
+                        $base_url = network_admin_url( 'users.php' );
+                } else {
+                        $base_url = bp_get_admin_url( 'users.php' );
+                }
+
+                $url     = add_query_arg( 'page', 'bp-signups', $base_url );
                 $text    = sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $signups ) . ')</span>' );
 
                 $views['registered'] = sprintf( '<a href="%1$s" class="%2$s">%3$s</a>', esc_url( $url ), $class, $text );
@@ -1394 +1411 @@
                 // Prepare the display of the Community Profile screen.
                 if ( ! in_array( $doaction, $allowed_actions ) || ( -1 == $doaction ) ) {
 
-                        if ( bp_core_do_network_admin() ) {
+                        if ( is_network_admin() ) {
                                 $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_MS_List_Table', 'ms-users' );
                         } else {
                                 $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_List_Table', 'users' );
@@ -1783 +1800 @@
                 // Prepare the group items for display.
                 $bp_members_signup_list_table->prepare_items();
 
+                if ( is_network_admin() ) {
+                        $form_url = network_admin_url( 'users.php' );
+                } else {
+                        $form_url = bp_get_admin_url( 'users.php' );
+                }
+
                 $form_url = add_query_arg(
                         array(
                                 'page' => 'bp-signups',
                         ),
-                        bp_get_admin_url( 'users.php' )
+                        $form_url
                 );
 
                 $search_form_url = remove_query_arg(
@@ -1923 +1946 @@
                         'signup_ids' => implode( ',', $signup_ids )
                 );
 
-                $cancel_url = add_query_arg( $url_args, bp_get_admin_url( 'users.php' ) );
+                if ( is_network_admin() ) {
+                        $base_url = network_admin_url( 'users.php' );
+                } else {
+                        $base_url = bp_get_admin_url( 'users.php' );
+                }
+
+                $cancel_url = add_query_arg( $url_args, $base_url );
                 $action_url = wp_nonce_url(
                         add_query_arg(
                                 array_merge( $url_args, $action_args ),
-                                bp_get_admin_url( 'users.php' )
+                                $base_url
                         ),
                         'signups_' . $action
                 );