From 836ec33dca5258a21452b68701f4d62a4d60d949 Mon Sep 17 00:00:00 2001 From: scribu Date: Wed, 3 Nov 2010 21:09:27 +0000 Subject: [PATCH] List-table Class Names: Consistency's Revenge. See #14579 git-svn-id: http://svn.automattic.com/wordpress/trunk@16171 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- ...e.php => class-wp-list-table-comments.php} | 6 ++-- ...able.php => class-wp-list-table-links.php} | 4 +-- ...able.php => class-wp-list-table-media.php} | 4 +-- ...e.php => class-wp-list-table-ms-sites.php} | 4 +-- ....php => class-wp-list-table-ms-themes.php} | 4 +-- ...e.php => class-wp-list-table-ms-users.php} | 4 +-- ...=> class-wp-list-table-plugin-install.php} | 4 +-- ...le.php => class-wp-list-table-plugins.php} | 4 +-- ...able.php => class-wp-list-table-posts.php} | 4 +-- ...able.php => class-wp-list-table-terms.php} | 4 +-- ... => class-wp-list-table-theme-install.php} | 4 +-- ...ble.php => class-wp-list-table-themes.php} | 4 +-- ...able.php => class-wp-list-table-users.php} | 4 +-- wp-admin/includes/list-table.php | 30 +++++++++---------- wp-admin/includes/meta-boxes.php | 2 +- wp-admin/includes/template.php | 2 +- 16 files changed, 44 insertions(+), 44 deletions(-) rename wp-admin/includes/{class-wp-comments-list-table.php => class-wp-list-table-comments.php} (99%) rename wp-admin/includes/{class-wp-links-list-table.php => class-wp-list-table-links.php} (98%) rename wp-admin/includes/{class-wp-media-list-table.php => class-wp-list-table-media.php} (99%) rename wp-admin/includes/{class-wp-ms-sites-list-table.php => class-wp-list-table-ms-sites.php} (99%) rename wp-admin/includes/{class-wp-ms-themes-list-table.php => class-wp-list-table-ms-themes.php} (98%) rename wp-admin/includes/{class-wp-ms-users-list-table.php => class-wp-list-table-ms-users.php} (98%) rename wp-admin/includes/{class-wp-plugin-install-list-table.php => class-wp-list-table-plugin-install.php} (98%) rename wp-admin/includes/{class-wp-plugins-list-table.php => class-wp-list-table-plugins.php} (99%) rename wp-admin/includes/{class-wp-posts-list-table.php => class-wp-list-table-posts.php} (99%) rename wp-admin/includes/{class-wp-terms-list-table.php => class-wp-list-table-terms.php} (99%) rename wp-admin/includes/{class-wp-theme-install-list-table.php => class-wp-list-table-theme-install.php} (97%) rename wp-admin/includes/{class-wp-themes-list-table.php => class-wp-list-table-themes.php} (98%) rename wp-admin/includes/{class-wp-users-list-table.php => class-wp-list-table-users.php} (99%) diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-list-table-comments.php similarity index 99% rename from wp-admin/includes/class-wp-comments-list-table.php rename to wp-admin/includes/class-wp-list-table-comments.php index ec7711d88..125b58501 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-list-table-comments.php @@ -14,14 +14,14 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Comments_List_Table extends WP_List_Table { +class WP_List_Table_Comments extends WP_List_Table { var $checkbox = true; var $from_ajax = false; var $pending_count = array(); - function WP_Comments_List_Table() { + function WP_List_Table_Comments() { global $mode; $mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode']; @@ -502,7 +502,7 @@ class WP_Comments_List_Table extends WP_List_Table { * * @see WP_Comments_Table */ -class WP_Post_Comments_List_Table extends WP_Comments_List_Table { +class WP_List_Table_Post_Comments extends WP_List_Table_Comments { function get_columns() { return array( diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-list-table-links.php similarity index 98% rename from wp-admin/includes/class-wp-links-list-table.php rename to wp-admin/includes/class-wp-list-table-links.php index cfff1bffd..d78d0e7ab 100644 --- a/wp-admin/includes/class-wp-links-list-table.php +++ b/wp-admin/includes/class-wp-list-table-links.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Links_List_Table extends WP_List_Table { +class WP_List_Table_Links extends WP_List_Table { - function WP_Links_List_Table() { + function WP_List_Table_Links() { parent::WP_List_Table( array( 'screen' => 'link-manager', 'plural' => 'bookmarks', diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-list-table-media.php similarity index 99% rename from wp-admin/includes/class-wp-media-list-table.php rename to wp-admin/includes/class-wp-list-table-media.php index 5b0b7f7d9..b5bf2738a 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-list-table-media.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Media_List_Table extends WP_List_Table { +class WP_List_Table_Media extends WP_List_Table { - function WP_Media_List_Table() { + function WP_List_Table_Media() { global $detached; $detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] ); diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-list-table-ms-sites.php similarity index 99% rename from wp-admin/includes/class-wp-ms-sites-list-table.php rename to wp-admin/includes/class-wp-list-table-ms-sites.php index 629750117..28cf3b532 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-list-table-ms-sites.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_MS_Sites_List_Table extends WP_List_Table { +class WP_List_Table_MS_Sites extends WP_List_Table { - function WP_MS_Sites_List_Table() { + function WP_List_Table_MS_Sites() { parent::WP_List_Table( array( 'screen' => 'sites-network', 'plural' => 'sites', diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-list-table-ms-themes.php similarity index 98% rename from wp-admin/includes/class-wp-ms-themes-list-table.php rename to wp-admin/includes/class-wp-list-table-ms-themes.php index 3b421e883..e9aa1eb5e 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-list-table-ms-themes.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_MS_Themes_List_Table extends WP_List_Table { +class WP_List_Table_MS_Themes extends WP_List_Table { - function WP_MS_Themes_List_Table() { + function WP_List_Table_MS_Themes() { global $status, $page; $default_status = get_user_option( 'themes_last_view' ); diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-list-table-ms-users.php similarity index 98% rename from wp-admin/includes/class-wp-ms-users-list-table.php rename to wp-admin/includes/class-wp-list-table-ms-users.php index 45abc6541..9d7ac02f9 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-list-table-ms-users.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_MS_Users_List_Table extends WP_List_Table { +class WP_List_Table_MS_Users extends WP_List_Table { - function WP_MS_Users_List_Table() { + function WP_List_Table_MS_Users() { parent::WP_List_Table( array( 'screen' => 'users-network', ) ); diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-list-table-plugin-install.php similarity index 98% rename from wp-admin/includes/class-wp-plugin-install-list-table.php rename to wp-admin/includes/class-wp-list-table-plugin-install.php index 9ba365bcc..263ddd63f 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-list-table-plugin-install.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Plugin_Install_List_Table extends WP_List_Table { +class WP_List_Table_Plugin_Install extends WP_List_Table { - function WP_Plugin_Install_List_Table() { + function WP_List_Table_Plugin_Install() { parent::WP_List_Table( array( 'screen' => 'plugin-install', ) ); diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-list-table-plugins.php similarity index 99% rename from wp-admin/includes/class-wp-plugins-list-table.php rename to wp-admin/includes/class-wp-list-table-plugins.php index c3b16a04a..ad1f32cd8 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-list-table-plugins.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Plugins_List_Table extends WP_List_Table { +class WP_List_Table_Plugins extends WP_List_Table { - function WP_Plugins_List_Table() { + function WP_List_Table_Plugins() { global $status, $page; $default_status = get_user_option( 'plugins_last_view' ); diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-list-table-posts.php similarity index 99% rename from wp-admin/includes/class-wp-posts-list-table.php rename to wp-admin/includes/class-wp-list-table-posts.php index 1c89534fc..496b3a8b6 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-list-table-posts.php @@ -6,7 +6,7 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Posts_List_Table extends WP_List_Table { +class WP_List_Table_Posts extends WP_List_Table { /** * Whether the items should be displayed hierarchically or linearly @@ -44,7 +44,7 @@ class WP_Posts_List_Table extends WP_List_Table { */ var $sticky_posts_count = 0; - function WP_Posts_List_Table() { + function WP_List_Table_Posts() { global $post_type_object, $post_type, $current_screen, $wpdb; if ( !isset( $_REQUEST['post_type'] ) ) diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-list-table-terms.php similarity index 99% rename from wp-admin/includes/class-wp-terms-list-table.php rename to wp-admin/includes/class-wp-list-table-terms.php index d355491bc..b909524a7 100644 --- a/wp-admin/includes/class-wp-terms-list-table.php +++ b/wp-admin/includes/class-wp-list-table-terms.php @@ -6,11 +6,11 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Terms_List_Table extends WP_List_Table { +class WP_List_Table_Terms extends WP_List_Table { var $callback_args; - function WP_Terms_List_Table() { + function WP_List_Table_Terms() { global $post_type, $taxonomy, $tax, $current_screen; wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) ); diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-list-table-theme-install.php similarity index 97% rename from wp-admin/includes/class-wp-theme-install-list-table.php rename to wp-admin/includes/class-wp-list-table-theme-install.php index a034552b1..25371607f 100644 --- a/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/wp-admin/includes/class-wp-list-table-theme-install.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Theme_Install_List_Table extends WP_List_Table { +class WP_List_Table_Theme_Install extends WP_List_Table { - function WP_Theme_Install_List_Table() { + function WP_List_Table_Theme_Install() { parent::WP_List_Table( array( 'screen' => 'theme-install', ) ); diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-list-table-themes.php similarity index 98% rename from wp-admin/includes/class-wp-themes-list-table.php rename to wp-admin/includes/class-wp-list-table-themes.php index c39df5aa6..b37544968 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-list-table-themes.php @@ -6,12 +6,12 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Themes_List_Table extends WP_List_Table { +class WP_List_Table_Themes extends WP_List_Table { var $search = array(); var $features = array(); - function WP_Themes_List_Table() { + function WP_List_Table_Themes() { parent::__construct( array( 'screen' => 'themes', ) ); diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-list-table-users.php similarity index 99% rename from wp-admin/includes/class-wp-users-list-table.php rename to wp-admin/includes/class-wp-list-table-users.php index f2a80dd04..6877ad042 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-list-table-users.php @@ -6,9 +6,9 @@ * @subpackage List_Table * @since 3.1.0 */ -class WP_Users_List_Table extends WP_List_Table { +class WP_List_Table_Users extends WP_List_Table { - function WP_Users_List_Table() { + function WP_List_Table_Users() { parent::WP_List_Table( array( 'screen' => 'users', 'plural' => 'users' diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php index bde883c30..14fcaeab0 100644 --- a/wp-admin/includes/list-table.php +++ b/wp-admin/includes/list-table.php @@ -38,25 +38,25 @@ function get_list_table( $class ) { function require_list_table( $class ) { $core_classes = array( //Site Admin - 'WP_Posts_List_Table' => 'posts', - 'WP_Media_List_Table' => 'media', - 'WP_Terms_List_Table' => 'terms', - 'WP_Users_List_Table' => 'users', - 'WP_Comments_List_Table' => 'comments', - 'WP_Post_Comments_List_Table' => 'comments', - 'WP_Links_List_Table' => 'links', - 'WP_Plugin_Install_List_Table' => 'plugin-install', - 'WP_Themes_List_Table' => 'themes', - 'WP_Theme_Install_List_Table' => 'theme-install', - 'WP_Plugins_List_Table' => 'plugins', + 'WP_List_Table_Posts' => 'posts', + 'WP_List_Table_Media' => 'media', + 'WP_List_Table_Terms' => 'terms', + 'WP_List_Table_Users' => 'users', + 'WP_List_Table_Comments' => 'comments', + 'WP_List_Table_Post_Comments' => 'comments', + 'WP_List_Table_Links' => 'links', + 'WP_List_Table_Plugin_Install' => 'plugin-install', + 'WP_List_Table_Themes' => 'themes', + 'WP_List_Table_Theme_Install' => 'theme-install', + 'WP_List_Table_Plugins' => 'plugins', // Network Admin - 'WP_MS_Sites_List_Table' => 'ms-sites', - 'WP_MS_Users_List_Table' => 'ms-users', - 'WP_MS_Themes_List_Table' => 'ms-themes', + 'WP_List_Table_MS_Sites' => 'ms-sites', + 'WP_List_Table_MS_Users' => 'ms-users', + 'WP_List_Table_MS_Themes' => 'ms-themes', ); if ( isset( $core_classes[ $class ] ) ) { - require_once( ABSPATH . '/wp-admin/includes/class-wp-' . $core_classes[ $class ] . '-list-table.php' ); + require_once( ABSPATH . '/wp-admin/includes/class-wp-list-table-' . $core_classes[ $class ] . '.php' ); return true; } diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 6ccaa16ad..a6078ebc5 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -461,7 +461,7 @@ function post_comment_meta_box($post) { wp_nonce_field( 'get-comments', 'add_comment_nonce', false ); - $wp_list_table = get_list_table('WP_Post_Comments_List_Table'); + $wp_list_table = get_list_table('WP_List_Table_Post_Comments'); ?> diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 8a243334a..c643e2736 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -329,7 +329,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', return; } - $wp_list_table = get_list_table('WP_Comments_List_Table'); + $wp_list_table = get_list_table('WP_List_Table_Comments'); list ( $columns, $hidden ) = $wp_list_table->get_column_info(); $hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );