Pruning shears.

git-svn-id: https://develop.svn.wordpress.org/trunk@15904 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2010-10-21 19:55:28 +00:00
parent 69994bf7ca
commit 7e48ac3e78
14 changed files with 38 additions and 38 deletions
+1 -1
View File
@@ -215,7 +215,7 @@ if ( isset($plugin_page) ) {
exit();
} else {
do_action("load-$pagenow");
// Backwards compatibility with old load-page-new.php, load-page.php,
// Backwards compatibility with old load-page-new.php, load-page.php,
// and load-categories.php actions.
if ( $typenow == 'page' ) {
if ( $pagenow == 'post-new.php' )
+14 -14
View File
@@ -161,7 +161,7 @@ class WP_Posts_Table extends WP_List_Table {
$status_links[$status_name] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
}
return $status_links;
}
@@ -998,7 +998,7 @@ class WP_Media_Table extends WP_List_Table {
function check_permissions() {
if ( !current_user_can('upload_files') )
wp_die( __( 'You do not have permission to upload files.' ) );
}
}
function prepare_items() {
global $lost, $wpdb, $wp_query, $post_mime_types, $avail_post_mime_types;
@@ -1488,10 +1488,10 @@ class WP_Terms_Table extends WP_List_Table {
$args['order'] = trim( stripslashes( $_REQUEST['order'] ) );
$this->callback_args = $args;
$this->set_pagination_args( array(
'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
'per_page' => $tags_per_page,
'per_page' => $tags_per_page,
) );
}
@@ -1820,10 +1820,10 @@ class WP_Users_Table extends WP_List_Table {
$wp_user_search = new WP_User_Query( $args );
$this->items = $wp_user_search->get_results();
$this->set_pagination_args( array(
'total_items' => $wp_user_search->get_total(),
'per_page' => $users_per_page,
'per_page' => $users_per_page,
) );
}
@@ -2566,7 +2566,7 @@ class WP_Links_Table extends WP_List_Table {
$args['order'] = $order;
$this->items = get_bookmarks( $args );
}
}
function no_items() {
_e( 'No links found.' );
@@ -2727,7 +2727,7 @@ class WP_Sites_Table extends WP_List_Table {
) );
}
function check_permissions() {
function check_permissions() {
if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'You do not have permission to access this page.' ) );
}
@@ -3048,10 +3048,10 @@ class WP_MS_Users_Table extends WP_List_Table {
$wp_user_search = new WP_User_Query( $args );
$this->items = $wp_user_search->get_results();
$this->set_pagination_args( array(
'total_items' => $wp_user_search->get_total(),
'per_page' => $users_per_page,
'per_page' => $users_per_page,
) );
}
@@ -3371,7 +3371,7 @@ class WP_Plugins_Table extends WP_List_Table {
}
uasort( $this->items, '_order_plugins_callback' );
}
$plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
$start = ( $page - 1 ) * $plugins_per_page;
@@ -3644,7 +3644,7 @@ class WP_Plugin_Install_Table extends WP_List_Table {
function check_permissions() {
if ( ! current_user_can('install_plugins') )
wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
}
function prepare_items() {
@@ -4085,8 +4085,8 @@ class WP_Theme_Install_Table extends WP_List_Table {
function prepare_items() {
include( ABSPATH . 'wp-admin/includes/theme-install.php' );
global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
wp_reset_vars( array( 'tab' ) );
$paged = $this->get_pagenum();
+2 -2
View File
@@ -148,7 +148,7 @@ class WP_List_Table {
function get_pagination_arg( $key ) {
if ( 'page' == $key )
return $this->get_pagenum();
if ( isset( $this->_pagination_args[$key] ) )
return $this->_pagination_args[$key];
}
@@ -262,7 +262,7 @@ class WP_List_Table {
if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
return $_REQUEST['action2'];
return false;
}
+2 -2
View File
@@ -47,7 +47,7 @@ var ThemeViewer;
// Set the options
opts.search = $( 'input[name=s]' ).val();
opts.order = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random';
$( '#availablethemes td' ).fadeTo( 500, 0.1, function() {
$( '#availablethemes td img' ).hide();
} );
@@ -55,7 +55,7 @@ var ThemeViewer;
return false;
});
}
// These are the functions we expose
var api = {
init: init
+3 -3
View File
@@ -26,9 +26,9 @@ $submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'manage_network_them
$submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
$plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
$update_plugins = get_site_transient( 'update_plugins' );
if ( !empty($update_plugins->response) )
$plugin_update_count = count( $update_plugins->response );
$update_plugins = get_site_transient( 'update_plugins' );
if ( !empty($update_plugins->response) )
$plugin_update_count = count( $update_plugins->response );
$menu[20] = array(sprintf( __('Plugins %s'), "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
$submenu['plugins.php'][5] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php' );
$submenu['plugins.php'][10] = array( _x('Add New', 'plugin editor'), 'install_plugins', 'plugin-install.php' );
+2 -2
View File
@@ -40,14 +40,14 @@ include(ABSPATH . 'wp-admin/admin-header.php');
?>
<div class="wrap">
<?php
screen_icon();
screen_icon();
if ( is_network_admin() ) : ?>
<h2><?php echo esc_html( $title ); ?></h2>
<?php else : ?>
<h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
<?php
<?php
endif;
$wp_list_table->views(); ?>
+1 -1
View File
@@ -146,7 +146,7 @@ if ( ! current_user_can( 'switch_themes' ) ) {
<?php foreach ( $feature_list as $feature_name => $features ) :
$feature_name = esc_html( $feature_name ); ?>
<div class="feature-container">
<div class="feature-name"><?php echo $feature_name ?></div>