Changeset 16195

Timestamp:

11/04/2010 09:02:13 PM (14 years ago)

Author:

scribu

Message:

Rename property _screen to screen. See #14579

Location:

trunk/wp-admin/includes

Files:

• class-wp-list-table.php (modified) (7 diffs)
• class-wp-media-list-table.php (modified) (2 diffs)
• class-wp-plugins-list-table.php (modified) (9 diffs)
• class-wp-posts-list-table.php (modified) (2 diffs)

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

@@ -49 +49 @@
      * @since 3.1.0
      * @var object
-     * @access private
-     */
-    var $_screen;
+     * @access protected
+     */
+    var $screen;
 
     /**
@@ -85 +85 @@
         ) );
 
-        $this->_screen = $args['screen'];
-
-        if ( is_string( $this->_screen ) )
-            $this->_screen = convert_to_screen( $this->_screen );
-
-        add_filter( 'manage_' . $this->_screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
+        $this->screen = $args['screen'];
+
+        if ( is_string( $this->screen ) )
+            $this->screen = convert_to_screen( $this->screen );
+
+        add_filter( 'manage_' . $this->screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
 
         if ( !$args['plural'] )
-            $args['plural'] = $this->_screen->base;
+            $args['plural'] = $this->screen->base;
 
         $this->_args = $args;
@@ -205 +205 @@
     function views() {
         $views = $this->get_views();
-        $views = apply_filters( 'views_' . $this->_screen->base, $views );
+        $views = apply_filters( 'views_' . $this->screen->base, $views );
 
         if ( empty( $views ) )
@@ -238 +238 @@
         if ( is_null( $this->_actions ) ) {
             $this->_actions = $this->get_bulk_actions();
-            $this->_actions = apply_filters( 'bulk_actions-' . $this->_screen->base, $this->_actions );
+            $this->_actions = apply_filters( 'bulk_actions-' . $this->screen->base, $this->_actions );
             $two = '';
         }
@@ -536 +536 @@
     function get_column_info() {
         if ( !isset( $this->_column_headers ) ) {
-            $columns = get_column_headers( $this->_screen );
-            $hidden = get_hidden_columns( $this->_screen );
-            $sortable = apply_filters( 'manage_' . $this->_screen->id . '_sortable_columns', $this->get_sortable_columns() );
+            $columns = get_column_headers( $this->screen );
+            $hidden = get_hidden_columns( $this->screen );
+            $sortable = apply_filters( 'manage_' . $this->screen->id . '_sortable_columns', $this->get_sortable_columns() );
 
             $this->_column_headers = array( $columns, $hidden, $sortable );
@@ -555 +555 @@
      */
     function print_column_headers( $with_id = true ) {
-        $screen = $this->_screen;
+        $screen = $this->screen;
 
         list( $columns, $hidden, $sortable ) = $this->get_column_info();
@@ -808 +808 @@
         $args = array(
             'class' => get_class( $this ),
-            'screen' => $this->_screen
+            'screen' => $this->screen
         );
 

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

@@ -152 +152 @@
         //$posts_columns['tags'] = _x( 'Tags', 'column name' );
         /* translators: column name */
-        if ( 'upload' == $this->_screen->id ) {
+        if ( 'upload' == $this->screen->id ) {
             $posts_columns['parent'] = _x( 'Attached to', 'column name' );
             $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
@@ -158 +158 @@
         /* translators: column name */
         $posts_columns['date'] = _x( 'Date', 'column name' );
-        $posts_columns = apply_filters( 'manage_media_columns', $posts_columns, 'upload' != $this->_screen->id );
+        $posts_columns = apply_filters( 'manage_media_columns', $posts_columns, 'upload' != $this->screen->id );
 
         return $posts_columns;

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

@@ -58 +58 @@
         );
 
-        if ( ! is_multisite() || ( $this->_screen->is_network && 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();
@@ -86 +86 @@
         foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
             // Filter into individual sections
-            if ( is_plugin_active_for_network($plugin_file) && !$this->_screen->is_network ) {
+            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 ( ( !$this->_screen->is_network && is_plugin_active( $plugin_file ) )
-                || ( $this->_screen->is_network && 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 ( !$this->_screen->is_network && 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;
@@ -129 +129 @@
         }
 
-        $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->_screen->id}_per_page" ) );
+        $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->screen->id}_per_page" ) );
 
         $start = ( $page - 1 ) * $plugins_per_page;
@@ -255 +255 @@
 
         if ( 'active' != $status ) {
-            $action = $this->_screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
+            $action = $this->screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
             $actions[ $action ] = __( 'Activate' );
         }
@@ -262 +262 @@
             $actions['deactivate-selected'] = __( 'Deactivate' );
 
-        if ( !is_multisite() || $this->_screen->is_network ) {
+        if ( !is_multisite() || $this->screen->is_network ) {
             if ( current_user_can( 'update_plugins' ) )
                 $actions['update-selected'] = __( 'Update' );
@@ -314 +314 @@
 
             if ( 'mustuse' == $context ) {
-                if ( is_multisite() && !$this->_screen->is_network )
+                if ( is_multisite() && !$this->screen->is_network )
                     continue;
                 $is_active = true;
             } elseif ( 'dropins' == $context ) {
-                if ( is_multisite() && !$this->_screen->is_network )
+                if ( is_multisite() && !$this->screen->is_network )
                     continue;
                 $dropins = _get_dropins();
@@ -338 +338 @@
             } else {
                 $is_active_for_network = is_plugin_active_for_network($plugin_file);
-                if ( $this->_screen->is_network )
+                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() && !$this->_screen->is_network )
+                if ( $is_active_for_network && !is_super_admin() && !$this->screen->is_network )
                     continue;
 
-                if ( $this->_screen->is_network ) {
+                if ( $this->screen->is_network ) {
                     if ( $is_active_for_network ) {
                         if ( current_user_can( 'manage_network_plugins' ) )
@@ -360 +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 ) && !$this->_screen->is_network )
+                        if ( is_network_only_plugin( $plugin_file ) && !$this->screen->is_network )
                             continue;
 
@@ -368 +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 $this->_screen->is_network
+                 } // end if $this->screen->is_network
 
                 if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )

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

@@ -257 +257 @@
 
     function get_columns() {
-        $screen = $this->_screen;
+        $screen = $this->screen;
 
         if ( empty( $screen ) )
@@ -676 +676 @@
         global $mode;
 
-        $screen = $this->_screen;
+        $screen = $this->screen;
 
         $post = get_default_post_to_edit( $screen->post_type );