Changeset 15527

Timestamp:

08/24/2010 07:50:55 PM (14 years ago)

Author:

scribu

Message:

On the plugins page, set and at the right time. See #14579

Location:

trunk/wp-admin

Files:

• includes/default-list-tables.php (modified) (2 diffs)
• plugins.php (modified) (1 diff)

trunk/wp-admin/includes/default-list-tables.php

@@ -3062 +3062 @@
 
     function WP_Plugins_Table() {
+        global $status, $page;
+
+        $default_status = get_user_option( 'plugins_last_view' );
+        if ( empty( $default_status ) )
+            $default_status = 'all';
+        $status = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : $default_status;
+        if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
+            $status = 'all';
+        if ( $status != $default_status && 'search' != $status )
+            update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
+
+        $page = $this->get_pagenum();
+
         parent::WP_List_Table( array(
             'screen' => 'plugins',
@@ -3086 +3099 @@
 
         wp_reset_vars( array( 'orderby', 'order', 's' ) );
-
-        $page = $this->get_pagenum();
 
         $plugins = array(

trunk/wp-admin/plugins.php

@@ -294 +294 @@
 }
 
-$default_status = get_user_option( 'plugins_last_view' );
-if ( empty( $default_status ) )
-    $default_status = 'all';
-$status = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : $default_status;
-if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
-    $status = 'all';
-if ( $status != $default_status && 'search' != $status )
-    update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
-
 $wp_list_table->prepare_items();