Changeset 16125

Timestamp:

11/01/2010 08:37:02 AM (14 years ago)

Author:

westi

Message:

Make the class to filename mapping easier to read.
Ensure that we support PHP4 for now by passing references to objects in list tables code.
See #14579.

Location:

trunk/wp-admin/includes

Files:

• class-wp-list-table.php (modified) (4 diffs)
• list-table-ms-themes.php (modified) (2 diffs)
• list-table-plugins.php (modified) (2 diffs)

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

@@ -90 +90 @@
             $this->_screen = convert_to_screen( $this->_screen );
 
-        add_filter( 'manage_' . $this->_screen->id . '_columns', array( $this, 'get_columns' ), 0 );
+        add_filter( 'manage_' . $this->_screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
 
         if ( !$args['plural'] )
@@ -99 +99 @@
         if ( $args['ajax'] ) {
             wp_enqueue_script( 'list-table' );
-            add_action( 'admin_footer', array( $this, '_js_vars' ) );
+            add_action( 'admin_footer', array( &$this, '_js_vars' ) );
         }
     }
@@ -763 +763 @@
             elseif ( method_exists( $this, 'column_' . $column_name ) ) {
                 echo "<td $attributes>";
-                echo call_user_func( array( $this, 'column_' . $column_name ), $item );
+                echo call_user_func( array( &$this, 'column_' . $column_name ), $item );
                 echo "</td>";
             }
@@ -847 +847 @@
  */
 function require_list_table( $class ) {
-    $core_classes = array( 'WP_Posts_Table' => 'posts', 'WP_Media_Table' => 'media', 'WP_Terms_Table' => 'terms',
-        'WP_Users_Table' => 'users', 'WP_Comments_Table' => 'comments', 'WP_Post_Comments_Table' => 'comments',
-        'WP_Links_Table' => 'links', 'WP_Sites_Table' => 'sites', 'WP_MS_Users_Table' => 'ms-users',
-        'WP_Plugins_Table' => 'plugins', 'WP_Plugin_Install_Table' => 'plugin-install', 'WP_Themes_Table' => 'themes',
-        'WP_Theme_Install_Table' => 'theme-install', 'WP_MS_Themes_Table' => 'ms-themes' );
+    $core_classes = array(
+        'WP_Posts_Table' => 'posts',
+        'WP_Media_Table' => 'media',
+        'WP_Terms_Table' => 'terms',
+        'WP_Users_Table' => 'users',
+        'WP_Comments_Table' => 'comments',
+        'WP_Post_Comments_Table' => 'comments',
+        'WP_Links_Table' => 'links',
+        'WP_Sites_Table' => 'sites',
+        'WP_MS_Users_Table' => 'ms-users',
+        'WP_Plugins_Table' => 'plugins',
+        'WP_Plugin_Install_Table' => 'plugin-install',
+        'WP_Themes_Table' => 'themes',
+        'WP_Theme_Install_Table' => 'theme-install',
+        'WP_MS_Themes_Table' => 'ms-themes',
+    );
 
     if ( isset( $core_classes[ $class ] ) ) {

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

@@ -77 +77 @@
         if ( $s ) {
             $status = 'search';
-            $themes['search'] = array_filter( $themes['all'], array( $this, '_search_callback' ) );
+            $themes['search'] = array_filter( $themes['all'], array( &$this, '_search_callback' ) );
         }
 
@@ -94 +94 @@
             $order = strtoupper( $order );
 
-            uasort( $this->items, array( $this, '_order_callback' ) );
+            uasort( $this->items, array( &$this, '_order_callback' ) );
         }
 

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

@@ -110 +110 @@
         if ( $s ) {
             $status = 'search';
-            $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
+            $plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
         }
 
@@ -127 +127 @@
             $order = strtoupper( $order );
 
-            uasort( $this->items, array( $this, '_order_callback' ) );
+            uasort( $this->items, array( &$this, '_order_callback' ) );
         }