Changeset 15517

Timestamp:

08/21/2010 06:08:42 PM (14 years ago)

Author:

scribu

Message:

Make deprecated functions work. See #14651

Location:

trunk/wp-admin/includes

Files:

• admin.php (modified) (1 diff)
• default-list-tables.php (modified) (1 diff)
• deprecated.php (modified) (3 diffs)
• list-table.php (modified) (1 diff)

trunk/wp-admin/includes/admin.php

@@ -40 +40 @@
 require_once(ABSPATH . 'wp-admin/includes/template.php');
 
+/** WordPress List Table Administration API */
+require_once(ABSPATH . 'wp-admin/includes/list-table.php');
+
 /** WordPress Theme Administration API */
 require_once(ABSPATH . 'wp-admin/includes/theme.php');

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

@@ -1 +1 @@
 <?php
-
-require_once('list-table.php');
 
 /**

trunk/wp-admin/includes/deprecated.php

@@ -204 +204 @@
  * @deprecated 3.1.0
  * @deprecated Use WP_List_Table
- */
-function register_column_headers() {
-    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+ *
+ * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
+ * @param array $columns An array of columns with column IDs as the keys and translated column names as the values
+ * @see get_column_headers(), print_column_headers(), get_hidden_columns()
+ */
+function register_column_headers($screen, $columns) {
+    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+
+    global $_wp_column_headers;
+
+    if ( is_string($screen) )
+        $screen = convert_to_screen($screen);
+
+    if ( !isset($_wp_column_headers) )
+        $_wp_column_headers = array();
+
+    $_wp_column_headers[$screen->id] = $columns;
+}
+
+/**
+ * Get the column headers for a screen
+ *
+ * @since 2.7.0
+ * @deprecated 3.1.0
+ * @deprecated Use WP_List_Table
+ *
+ * @param string|object $screen The screen you want the headers for
+ * @return array Containing the headers in the format id => UI String
+ */
+function get_column_headers($screen) {
+    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+
+    $table = new _WP_List_Table_Compat($screen);
+    list( $columns ) = $table->get_column_headers();
+
+    return $columns;
 }
 
@@ -216 +249 @@
  * @deprecated Use WP_List_Table
  */
-function print_column_headers() {
-    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+function print_column_headers($screen, $id = true) {
+    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+
+    $table = new _WP_List_Table_Compat($screen);
+
+    $table->print_column_headers($id);
 }
 
@@ -223 +260 @@
  * Gets hidden column names for a particular screen.
  *
- * @since unknown
- * @deprecated 3.1.0
- * @deprecated Use WP_List_Table
- */
-function get_hidden_columns() {
-    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
-    return array();
-}
-
+ * @since 2.7.0
+ * @deprecated 3.1.0
+ * @deprecated Use WP_List_Table
+ *
+ * @param string $screen
+ * @return array
+ */
+function get_hidden_columns($screen) {
+    _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+
+    $table = new _WP_List_Table_Compat($screen);
+
+    return $table->get_hidden_columns();
+}
+
+// Helper class to be used only by deprecated functions
+class _WP_List_Table_Compat extends WP_List_Table {
+
+    function _WP_List_Table_Compat( $screen) {
+        parent::WP_List_Table( array(
+            'screen' => $screen,
+            'ajax' => false
+        ) );
+    }
+
+    function get_columns() {
+        global $_wp_column_headers;
+
+        if ( isset($_wp_column_headers[$this->_screen->id]) )
+            return $_wp_column_headers[$this->_screen->id];
+
+        return array(); 
+    }
+}
+

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

@@ -459 +459 @@
      * @since 3.1.0
      * @access protected
+     *
+     * @param bool $with_id Wether to set the id attribute or not
      */
     function print_column_headers( $with_id = true ) {