Changeset 17322
- Timestamp:
- 01/16/2011 09:47:24 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/edit-comments.php
r17321 r17322 12 12 wp_die(__('Cheatin’ uh?')); 13 13 14 $wp_list_table = get_list_table('WP_Comments_List_Table');14 $wp_list_table = _get_list_table('WP_Comments_List_Table'); 15 15 $pagenum = $wp_list_table->get_pagenum(); 16 16 -
trunk/wp-admin/edit-tags.php
r17321 r17322 13 13 wp_die( __( 'Cheatin’ uh?' ) ); 14 14 15 $wp_list_table = get_list_table('WP_Terms_List_Table');15 $wp_list_table = _get_list_table('WP_Terms_List_Table'); 16 16 17 17 $title = $tax->labels->name; -
trunk/wp-admin/edit.php
r17321 r17322 24 24 wp_die(__('Cheatin’ uh?')); 25 25 26 $wp_list_table = get_list_table('WP_Posts_List_Table');26 $wp_list_table = _get_list_table('WP_Posts_List_Table'); 27 27 $pagenum = $wp_list_table->get_pagenum(); 28 28 -
trunk/wp-admin/includes/class-wp-comments-list-table.php
r17262 r17322 14 14 * @subpackage List_Table 15 15 * @since 3.1.0 16 * @access private 16 17 */ 17 18 class WP_Comments_List_Table extends WP_List_Table { … … 267 268 extract( $this->_args ); 268 269 269 wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );270 // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); 270 271 271 272 $this->display_tablenav( 'top' ); … … 510 511 * @subpackage List_Table 511 512 * @since 3.1.0 513 * @access private 512 514 * 513 515 * @see WP_Comments_Table … … 537 539 extract( $this->_args ); 538 540 539 wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );541 // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); 540 542 ?> 541 543 <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0" style="display:none;"> -
trunk/wp-admin/includes/class-wp-links-list-table.php
r17102 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Links_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-list-table.php
r17321 r17322 14 14 * @subpackage List_Table 15 15 * @since 3.1.0 16 * @access private 16 17 */ 17 18 class WP_List_Table { … … 93 94 $this->_args = $args; 94 95 95 if ( $args['ajax'] ) {96 wp_enqueue_script( 'list-table' );97 add_action( 'admin_footer', array( &$this, '_js_vars' ) );98 }96 // if ( $args['ajax'] ) { 97 // wp_enqueue_script( 'list-table' ); 98 // add_action( 'admin_footer', array( &$this, '_js_vars' ) ); 99 // } 99 100 } 100 101 … … 200 201 <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label> 201 202 <input type="text" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" /> 202 <?php submit_button( $text, 'button', 'submit', false, array('id' => 'search-submit') ); ?>203 <?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?> 203 204 </p> 204 <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />205 205 <?php 206 206 } … … 468 468 * @access protected 469 469 */ 470 function pagination() { 471 if ( $this->_pagination ) { 472 echo $this->_pagination; 473 return; 474 } 475 470 function pagination( $which ) { 476 471 if ( empty( $this->_pagination_args ) ) 477 472 return; … … 507 502 ); 508 503 509 $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />", 510 esc_attr__( 'Current page' ), 511 esc_attr( 'paged' ), 512 number_format_i18n( $current ), 513 strlen( $total_pages ) 514 ); 504 if ( 'bottom' == $which ) 505 $html_current_page = $current; 506 else 507 $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />", 508 esc_attr__( 'Current page' ), 509 esc_attr( 'paged' ), 510 $current, 511 strlen( $total_pages ) 512 ); 513 515 514 $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) ); 516 515 $page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>'; … … 634 633 635 634 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; 635 $current_url = remove_query_arg( 'paged', $current_url ); 636 636 637 637 if ( isset( $_GET['orderby'] ) ) … … 693 693 extract( $this->_args ); 694 694 695 wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );696 697 695 $this->display_tablenav( 'top' ); 698 696 … … 749 747 $this->extra_tablenav( $which ); 750 748 $this->pagination( $which ); 751 752 if ( 'bottom' == $which ) {753 749 ?> 754 <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />755 <?php } ?>756 750 757 751 <br class="clear" /> -
trunk/wp-admin/includes/class-wp-media-list-table.php
r17222 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Media_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-ms-sites-list-table.php
r17180 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_MS_Sites_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-ms-themes-list-table.php
r17228 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_MS_Themes_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-ms-users-list-table.php
r17201 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_MS_Users_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-plugin-install-list-table.php
r17281 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Plugin_Install_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-plugins-list-table.php
r17228 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Plugins_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-posts-list-table.php
r17284 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Posts_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-terms-list-table.php
r17228 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Terms_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/class-wp-theme-install-list-table.php
r17303 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Theme_Install_List_Table extends WP_List_Table { … … 128 129 function display() { 129 130 130 wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );131 // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); 131 132 ?> 132 133 <div class="tablenav top"> -
trunk/wp-admin/includes/class-wp-themes-list-table.php
r17303 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Themes_List_Table extends WP_List_Table { … … 102 103 103 104 function display() { 104 wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );105 // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); 105 106 ?> 106 107 <?php $this->tablenav( 'top' ); ?> -
trunk/wp-admin/includes/class-wp-users-list-table.php
r17319 r17322 6 6 * @subpackage List_Table 7 7 * @since 3.1.0 8 * @access private 8 9 */ 9 10 class WP_Users_List_Table extends WP_List_Table { -
trunk/wp-admin/includes/list-table.php
r17293 r17322 11 11 * Fetch an instance of a WP_List_Table class. 12 12 * 13 * @access private 13 14 * @since 3.1.0 14 15 * 15 * @param string $class The type of the list table, which is the class name except for core list tables.16 * @param string $class The type of the list table, which is the class name. 16 17 * @return object|bool Object on success, false if the class does not exist. 17 18 */ 18 function get_list_table( $class ) { 19 $class = apply_filters( "get_list_table_$class", $class ); 20 21 require_list_table( $class ); 22 23 if ( class_exists( $class ) ) 24 return new $class; 25 return false; 26 } 27 28 /** 29 * Include the proper file for a core list table. 30 * 31 * Useful for extending a core class that would not otherwise be required. 32 * 33 * @since 3.1.0 34 * 35 * @param string $table The core table to include. 36 * @return bool True on success, false on failure. 37 */ 38 function require_list_table( $class ) { 19 function _get_list_table( $class ) { 39 20 $core_classes = array( 40 21 //Site Admin … … 58 39 if ( isset( $core_classes[ $class ] ) ) { 59 40 require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $core_classes[ $class ] . '-list-table.php' ); 60 return true;41 return new $class; 61 42 } 62 43 -
trunk/wp-admin/includes/meta-boxes.php
r17250 r17322 485 485 wp_nonce_field( 'get-comments', 'add_comment_nonce', false ); 486 486 487 $wp_list_table = get_list_table('WP_Post_Comments_List_Table');487 $wp_list_table = _get_list_table('WP_Post_Comments_List_Table'); 488 488 $wp_list_table->display( true ); 489 489 ?> -
trunk/wp-admin/includes/template.php
r17318 r17322 333 333 334 334 if ( $mode == 'single' ) { 335 $wp_list_table = get_list_table('WP_Post_Comments_List_Table');335 $wp_list_table = _get_list_table('WP_Post_Comments_List_Table'); 336 336 } else { 337 $wp_list_table = get_list_table('WP_Comments_List_Table');337 $wp_list_table = _get_list_table('WP_Comments_List_Table'); 338 338 } 339 339 -
trunk/wp-admin/includes/update.php
r16994 r17322 195 195 $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); 196 196 197 $wp_list_table = get_list_table('WP_Plugins_List_Table');197 $wp_list_table = _get_list_table('WP_Plugins_List_Table'); 198 198 199 199 if ( is_network_admin() || !is_multisite() ) { … … 271 271 $details_url = self_admin_url("theme-install.php?tab=theme-information&theme=$theme_key&TB_iframe=true&width=600&height=400"); 272 272 273 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');273 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); 274 274 275 275 echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">'; -
trunk/wp-admin/link-manager.php
r17307 r17322 12 12 wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) ); 13 13 14 $wp_list_table = get_list_table('WP_Links_List_Table');14 $wp_list_table = _get_list_table('WP_Links_List_Table'); 15 15 16 16 // Handle bulk deletes -
trunk/wp-admin/network/site-themes.php
r17314 r17322 33 33 ); 34 34 35 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');35 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); 36 36 37 37 $action = $wp_list_table->current_action(); -
trunk/wp-admin/network/site-users.php
r17314 r17322 17 17 wp_die(__('You do not have sufficient permissions to edit this site.')); 18 18 19 $wp_list_table = get_list_table('WP_Users_List_Table');19 $wp_list_table = _get_list_table('WP_Users_List_Table'); 20 20 $wp_list_table->prepare_items(); 21 21 -
trunk/wp-admin/network/sites.php
r17274 r17322 17 17 wp_die( __( 'You do not have permission to access this page.' ) ); 18 18 19 $wp_list_table = get_list_table('WP_MS_Sites_List_Table');19 $wp_list_table = _get_list_table('WP_MS_Sites_List_Table'); 20 20 $pagenum = $wp_list_table->get_pagenum(); 21 21 -
trunk/wp-admin/network/themes.php
r17274 r17322 22 22 wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) ); 23 23 24 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');24 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); 25 25 $pagenum = $wp_list_table->get_pagenum(); 26 26 -
trunk/wp-admin/network/users.php
r17144 r17322 17 17 wp_die( __( 'You do not have permission to access this page.' ) ); 18 18 19 $wp_list_table = get_list_table('WP_MS_Users_List_Table');19 $wp_list_table = _get_list_table('WP_MS_Users_List_Table'); 20 20 $wp_list_table->prepare_items(); 21 21 -
trunk/wp-admin/plugin-install.php
r17274 r17322 21 21 } 22 22 23 $wp_list_table = get_list_table('WP_Plugin_Install_List_Table');23 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table'); 24 24 $pagenum = $wp_list_table->get_pagenum(); 25 25 $wp_list_table->prepare_items(); -
trunk/wp-admin/plugins.php
r17274 r17322 20 20 wp_die( __( 'You do not have sufficient permissions to manage plugins for this site.' ) ); 21 21 22 $wp_list_table = get_list_table('WP_Plugins_List_Table');22 $wp_list_table = _get_list_table('WP_Plugins_List_Table'); 23 23 $pagenum = $wp_list_table->get_pagenum(); 24 24 -
trunk/wp-admin/theme-install.php
r17274 r17322 21 21 } 22 22 23 $wp_list_table = get_list_table('WP_Theme_Install_List_Table');23 $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); 24 24 $pagenum = $wp_list_table->get_pagenum(); 25 25 $wp_list_table->prepare_items(); -
trunk/wp-admin/themes.php
r17308 r17322 13 13 wp_die( __( 'Cheatin’ uh?' ) ); 14 14 15 $wp_list_table = get_list_table('WP_Themes_List_Table');15 $wp_list_table = _get_list_table('WP_Themes_List_Table'); 16 16 17 17 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) { -
trunk/wp-admin/upload.php
r17321 r17322 13 13 wp_die( __( 'You do not have permission to upload files.' ) ); 14 14 15 $wp_list_table = get_list_table('WP_Media_List_Table');15 $wp_list_table = _get_list_table('WP_Media_List_Table'); 16 16 $pagenum = $wp_list_table->get_pagenum(); 17 17 -
trunk/wp-admin/users.php
r17277 r17322 13 13 wp_die( __( 'Cheatin’ uh?' ) ); 14 14 15 $wp_list_table = get_list_table('WP_Users_List_Table');15 $wp_list_table = _get_list_table('WP_Users_List_Table'); 16 16 17 17 $title = __('Users'); -
trunk/wp-includes/script-loader.php
r17321 r17322 299 299 $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' ); 300 300 $scripts->add_data( 'admin-custom-fields', 'group', 1 ); 301 302 $scripts->add( 'list-table', "/wp-admin/js/list-table$suffix.js", array( 'jquery-query', 'jquery-serialize-object' ), '20110111a' );303 $scripts->add_data( 'list-table', 'group', 1 );304 $scripts->localize( 'list-table', 'listTableL10n', array(305 'error' => __('An error has occurred while loading the items.'),306 'search' => __('Search results for “%s”'),307 'l10n_print_after' => 'try{convertEntities(listTableL10n);}catch(e){};'308 ) );309 301 310 302 $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'list-table', 'jquery-ui-resizable', 'quicktags'), '20101223' );
Note: See TracChangeset
for help on using the changeset viewer.