Ticket #5068: 5068.diff

bp-activity/bp-activity-admin.php

@@ -940 +940 @@
                         'ajax'     => false,
                         'plural'   => 'activities',
                         'singular' => 'activity',
+                        'screen'   => get_current_screen()
                 ) );
         }
 
@@ -949 +950 @@
          * @since BuddyPress (1.6)
          */
         function prepare_items() {
-                $screen = get_current_screen();
 
                 // Option defaults
                 $filter           = array();
@@ -962 +962 @@
                 $page = $this->get_pagenum();
 
                 // Set per page from the screen options
-                $per_page = $this->get_items_per_page( str_replace( '-', '_', "{$screen->id}_per_page" ) );
+                $per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->screen->id}_per_page" ) );
 
                 // Check if we're on the "Spam" view
                 if ( !empty( $_REQUEST['activity_status'] ) && 'spam' == $_REQUEST['activity_status'] ) {