Skip to content

Commit 7e48ac3

Browse files
nacinnacin
committed
Pruning shears.
git-svn-id: https://develop.svn.wordpress.org/trunk@15904 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 69994bf commit 7e48ac3

14 files changed

Lines changed: 38 additions & 38 deletions

‎wp-admin/admin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
exit();
216216
} else {
217217
do_action("load-$pagenow");
218-
// Backwards compatibility with old load-page-new.php, load-page.php,
218+
// Backwards compatibility with old load-page-new.php, load-page.php,
219219
// and load-categories.php actions.
220220
if ( $typenow == 'page' ) {
221221
if ( $pagenow == 'post-new.php' )

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function get_views() {
161161

162162
$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>';
163163
}
164-
164+
165165
return $status_links;
166166
}
167167

@@ -998,7 +998,7 @@ function WP_Media_Table() {
998998
function check_permissions() {
999999
if ( !current_user_can('upload_files') )
10001000
wp_die( __( 'You do not have permission to upload files.' ) );
1001-
}
1001+
}
10021002

10031003
function prepare_items() {
10041004
global $lost, $wpdb, $wp_query, $post_mime_types, $avail_post_mime_types;
@@ -1488,10 +1488,10 @@ function prepare_items() {
14881488
$args['order'] = trim( stripslashes( $_REQUEST['order'] ) );
14891489

14901490
$this->callback_args = $args;
1491-
1491+
14921492
$this->set_pagination_args( array(
14931493
'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
1494-
'per_page' => $tags_per_page,
1494+
'per_page' => $tags_per_page,
14951495
) );
14961496
}
14971497

@@ -1820,10 +1820,10 @@ function prepare_items() {
18201820
$wp_user_search = new WP_User_Query( $args );
18211821

18221822
$this->items = $wp_user_search->get_results();
1823-
1823+
18241824
$this->set_pagination_args( array(
18251825
'total_items' => $wp_user_search->get_total(),
1826-
'per_page' => $users_per_page,
1826+
'per_page' => $users_per_page,
18271827
) );
18281828
}
18291829

@@ -2566,7 +2566,7 @@ function prepare_items() {
25662566
$args['order'] = $order;
25672567

25682568
$this->items = get_bookmarks( $args );
2569-
}
2569+
}
25702570

25712571
function no_items() {
25722572
_e( 'No links found.' );
@@ -2727,7 +2727,7 @@ function WP_Sites_Table() {
27272727
) );
27282728
}
27292729

2730-
function check_permissions() {
2730+
function check_permissions() {
27312731
if ( ! current_user_can( 'manage_sites' ) )
27322732
wp_die( __( 'You do not have permission to access this page.' ) );
27332733
}
@@ -3048,10 +3048,10 @@ function prepare_items() {
30483048
$wp_user_search = new WP_User_Query( $args );
30493049

30503050
$this->items = $wp_user_search->get_results();
3051-
3051+
30523052
$this->set_pagination_args( array(
30533053
'total_items' => $wp_user_search->get_total(),
3054-
'per_page' => $users_per_page,
3054+
'per_page' => $users_per_page,
30553055
) );
30563056
}
30573057

@@ -3371,7 +3371,7 @@ function _order_plugins_callback( $plugin_a, $plugin_b ) {
33713371
}
33723372
uasort( $this->items, '_order_plugins_callback' );
33733373
}
3374-
3374+
33753375
$plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
33763376

33773377
$start = ( $page - 1 ) * $plugins_per_page;
@@ -3644,7 +3644,7 @@ function WP_Plugin_Install_Table() {
36443644

36453645
function check_permissions() {
36463646
if ( ! current_user_can('install_plugins') )
3647-
wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
3647+
wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
36483648
}
36493649

36503650
function prepare_items() {
@@ -4085,8 +4085,8 @@ function check_permissions() {
40854085
function prepare_items() {
40864086
include( ABSPATH . 'wp-admin/includes/theme-install.php' );
40874087

4088-
global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
4089-
4088+
global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
4089+
40904090
wp_reset_vars( array( 'tab' ) );
40914091

40924092
$paged = $this->get_pagenum();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function set_pagination_args( $args ) {
148148
function get_pagination_arg( $key ) {
149149
if ( 'page' == $key )
150150
return $this->get_pagenum();
151-
151+
152152
if ( isset( $this->_pagination_args[$key] ) )
153153
return $this->_pagination_args[$key];
154154
}
@@ -262,7 +262,7 @@ function current_action() {
262262

263263
if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
264264
return $_REQUEST['action2'];
265-
265+
266266
return false;
267267
}
268268

‎wp-admin/js/theme.dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ var ThemeViewer;
4747
// Set the options
4848
opts.search = $( 'input[name=s]' ).val();
4949
opts.order = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random';
50-
50+
5151
$( '#availablethemes td' ).fadeTo( 500, 0.1, function() {
5252
$( '#availablethemes td img' ).hide();
5353
} );
5454

5555
return false;
5656
});
5757
}
58-
58+
5959
// These are the functions we expose
6060
var api = {
6161
init: init

‎wp-admin/network/menu.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
$submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
2727

2828
$plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
29-
$update_plugins = get_site_transient( 'update_plugins' );
30-
if ( !empty($update_plugins->response) )
31-
$plugin_update_count = count( $update_plugins->response );
29+
$update_plugins = get_site_transient( 'update_plugins' );
30+
if ( !empty($update_plugins->response) )
31+
$plugin_update_count = count( $update_plugins->response );
3232
$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');
3333
$submenu['plugins.php'][5] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php' );
3434
$submenu['plugins.php'][10] = array( _x('Add New', 'plugin editor'), 'install_plugins', 'plugin-install.php' );

‎wp-admin/theme-install.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
?>
4141
<div class="wrap">
4242
<?php
43-
screen_icon();
43+
screen_icon();
4444

4545
if ( is_network_admin() ) : ?>
4646
<h2><?php echo esc_html( $title ); ?></h2>
4747
<?php else : ?>
4848
<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>
4949

50-
<?php
50+
<?php
5151
endif;
5252

5353
$wp_list_table->views(); ?>

‎wp-admin/themes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146

147147
<?php foreach ( $feature_list as $feature_name => $features ) :
148148
$feature_name = esc_html( $feature_name ); ?>
149-
149+
150150
<div class="feature-container">
151151
<div class="feature-name"><?php echo $feature_name ?></div>
152152

‎wp-includes/canonical.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
342342

343343
if ( !$redirect_url || $redirect_url == $requested_url )
344344
return false;
345-
345+
346346
// Hex encoded octets are case-insensitive.
347347
if ( false !== strpos($requested_url, '%') ) {
348348
if ( !function_exists('lowercase_octets') ) {

‎wp-includes/js/autosave.dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ autosave = function() {
260260
post_data["excerpt"] = jQuery("#excerpt").val();
261261
if ( jQuery("#post_author").size() )
262262
post_data["post_author"] = jQuery("#post_author").val();
263-
if ( jQuery("#parent_id").val() )
264-
post_data["parent_id"] = jQuery("#parent_id").val();
263+
if ( jQuery("#parent_id").val() )
264+
post_data["parent_id"] = jQuery("#parent_id").val();
265265
post_data["user_ID"] = jQuery("#user-id").val();
266266
if ( jQuery('#auto_draft').val() == '1' )
267267
post_data["auto_draft"] = '1';

‎wp-includes/nav-menu-template.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
314314
$possible_object_parents = array_filter( $possible_object_parents );
315315

316316
foreach ( (array) $menu_items as $key => $menu_item ) {
317-
317+
318318
$menu_items[$key]->current = false;
319-
319+
320320
$classes = (array) $menu_item->classes;
321321
$classes[] = 'menu-item';
322322
$classes[] = 'menu-item-type-' . $menu_item->type;
@@ -362,7 +362,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
362362
$current_url = untrailingslashit( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
363363
$item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
364364
$_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
365-
365+
366366
if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
367367
$classes[] = 'current-menu-item';
368368
$menu_items[$key]->current = true;
@@ -383,7 +383,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
383383
$active_parent_object_ids[] = (int) $menu_item->post_parent;
384384
$active_object = $menu_item->object;
385385
}
386-
386+
387387
if ( untrailingslashit($item_url) == home_url() )
388388
$classes[] = 'menu-item-home';
389389
}
@@ -403,7 +403,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
403403
$classes = (array) $parent_item->classes;
404404
$menu_items[$key]->current_item_ancestor = false;
405405
$menu_items[$key]->current_item_parent = false;
406-
406+
407407
if (
408408
isset( $parent_item->type ) &&
409409
(

0 commit comments

Comments
 (0)