Changeset 16194

Timestamp:

11/04/2010 08:49:30 PM (16 years ago)

Author:

scribu

Message:

Fix screen options for the network admin themes and plugins. Props ocean90. Fixes #15269. Also fixes [16190]

Location:

trunk/wp-admin

Files:

• includes/class-wp-ms-themes-list-table.php (modified) (1 diff)
• includes/class-wp-plugins-list-table.php (modified) (10 diffs)
• includes/misc.php (modified) (1 diff)
• network/themes.php (modified) (1 diff)
• plugins.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -96 +96 @@
                 }
 
-                $themes_per_page = $this->get_items_per_page( 'themes_per_page', 999 );
+                $themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
 
                 $start = ( $page - 1 ) * $themes_per_page;

trunk/wp-admin/includes/class-wp-plugins-list-table.php

@@ -20 +20 @@
                 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(
@@ -56 +58 @@
                 );
 
-                if ( ! is_multisite() || ( is_network_admin() && current_user_can('manage_network_plugins') ) ) {
+                if ( ! is_multisite() || ( $this->_screen->is_network && current_user_can('manage_network_plugins') ) ) {
                         if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) )
                                 $plugins['mustuse'] = get_mu_plugins();
@@ -84 +86 @@
                 foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
                         // Filter into individual sections
-                        if ( is_plugin_active_for_network($plugin_file) && !is_network_admin() ) {
+                        if ( is_plugin_active_for_network($plugin_file) && !$this->_screen->is_network ) {
                                 unset( $plugins['all'][ $plugin_file ] );
                                 continue;
                         } elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
                                 $plugins['network'][ $plugin_file ] = $plugin_data;
-                        } elseif ( ( !is_network_admin() && is_plugin_active( $plugin_file ) )
-                                || ( is_network_admin() && is_plugin_active_for_network( $plugin_file ) ) ) {
+                        } elseif ( ( !$this->_screen->is_network && is_plugin_active( $plugin_file ) )
+                                || ( $this->_screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
                                 $plugins['active'][ $plugin_file ] = $plugin_data;
                         } else {
-                                if ( !is_network_admin() && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
+                                if ( !$this->_screen->is_network && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
                                         $plugins['recently_activated'][ $plugin_file ] = $plugin_data;
                                 $plugins['inactive'][ $plugin_file ] = $plugin_data;
@@ -127 +129 @@
                 }
 
-                $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
+                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->_screen->id}_per_page" ) );
 
                 $start = ( $page - 1 ) * $plugins_per_page;
@@ -253 +255 @@
 
                 if ( 'active' != $status ) {
-                        $action = is_network_admin() ? 'network-activate-selected' : 'activate-selected'; 
+                        $action = $this->_screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
                         $actions[ $action ] = __( 'Activate' );
                 }
@@ -260 +262 @@
                         $actions['deactivate-selected'] = __( 'Deactivate' );
 
-                if ( !is_multisite() || is_network_admin() ) {
+                if ( !is_multisite() || $this->_screen->is_network ) {
                         if ( current_user_can( 'update_plugins' ) )
                                 $actions['update-selected'] = __( 'Update' );
@@ -312 +314 @@
 
                         if ( 'mustuse' == $context ) {
-                                if ( is_multisite() && !is_network_admin() )
+                                if ( is_multisite() && !$this->_screen->is_network )
                                         continue;
                                 $is_active = true;
                         } elseif ( 'dropins' == $context ) {
-                                if ( is_multisite() && !is_network_admin() )
+                                if ( is_multisite() && !$this->_screen->is_network )
                                         continue;
                                 $dropins = _get_dropins();
@@ -336 +338 @@
                         } else {
                                 $is_active_for_network = is_plugin_active_for_network($plugin_file);
-                                if ( is_network_admin() )
+                                if ( $this->_screen->is_network )
                                         $is_active = $is_active_for_network;
                                 else
                                         $is_active = is_plugin_active( $plugin_file );
 
-                                if ( $is_active_for_network && !is_super_admin() && !is_network_admin() )
+                                if ( $is_active_for_network && !is_super_admin() && !$this->_screen->is_network )
                                         continue;
 
-                                if ( is_network_admin() ) {
+                                if ( $this->_screen->is_network ) {
                                         if ( $is_active_for_network ) {
                                                 if ( current_user_can( 'manage_network_plugins' ) )
@@ -358 +360 @@
                                                 $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
                                         } else {
-                                                if ( is_network_only_plugin( $plugin_file ) && !is_network_admin() )
+                                                if ( is_network_only_plugin( $plugin_file ) && !$this->_screen->is_network )
                                                         continue;
 
@@ -366 +368 @@
                                                         $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                                         } // end if $is_active
-                                 } // end if is_network_admin()
+                                 } // end if $this->_screen->is_network
 
                                 if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )

trunk/wp-admin/includes/misc.php

@@ -344 +344 @@
                 switch ( $map_option ) {
                         case 'edit_per_page':
-                        case 'sites_network_per_page':
                         case 'users_per_page':
-                        case 'users_network_per_page':
                         case 'edit_comments_per_page':
                         case 'upload_per_page':
                         case 'edit_tags_per_page':
                         case 'plugins_per_page':
+                        // Network admin
+                        case 'sites_network_per_page':
+                        case 'users_network_per_page':
+                        case 'plugins_network_per_page':
+                        case 'themes_network_per_page':
                                 $value = (int) $value;
                                 if ( $value < 1 || $value > 999 )

trunk/wp-admin/network/themes.php

@@ -61 +61 @@
 add_thickbox();
 
-add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' ), 'default' => 999) );
+add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
 
 add_contextual_help($current_screen, 

trunk/wp-admin/plugins.php

@@ -297 +297 @@
 add_thickbox();
 
-add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' ), 'default' => 999) );
+add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' )) );
 
 add_contextual_help($current_screen,