Skip to content

Commit 67bee41

Browse files
author
ryan
committed
Remove extraneous spaces. Props kenan3008, dimadin. fixes #19501 #19433
git-svn-id: http://core.svn.wordpress.org/trunk@19596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent a945dbd commit 67bee41

32 files changed

+73
-68
lines changed

‎wp-admin/edit-tag-form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
else
2525
do_action('edit_tag_form_pre', $tag);
2626

27-
do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
27+
do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
2828

2929
<div class="wrap">
3030
<?php screen_icon(); ?>

‎wp-admin/edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
break;
134134
}
135135

136-
$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
136+
$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
137137

138138
wp_redirect($sendback);
139139
exit();

‎wp-admin/export.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function add_js() {
4141
get_current_screen()->add_help_tab( array(
4242
'id' => 'overview',
4343
'title' => __('Overview'),
44-
'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
44+
'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
4545
'<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
4646
) );
4747

‎wp-admin/includes/dashboard.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ function wp_dashboard_setup() {
8686
if ( !isset( $widget_options['dashboard_primary'] ) ) {
8787
$update = true;
8888
$widget_options['dashboard_primary'] = array(
89-
'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
90-
'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
89+
'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
90+
'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
9191
'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
9292
'items' => 2,
9393
'show_summary' => 1,
@@ -101,8 +101,8 @@ function wp_dashboard_setup() {
101101
if ( !isset( $widget_options['dashboard_secondary'] ) ) {
102102
$update = true;
103103
$widget_options['dashboard_secondary'] = array(
104-
'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
105-
'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
104+
'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
105+
'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
106106
'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
107107
'items' => 5,
108108
'show_summary' => 0,
@@ -700,7 +700,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
700700
$actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
701701
$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
702702
$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
703-
$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
703+
$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
704704
if ( !EMPTY_TRASH_DAYS )
705705
$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
706706
else
@@ -1290,7 +1290,7 @@ function wp_welcome_panel() {
12901290
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
12911291

12921292
<div class="welcome-panel-content">
1293-
<h3><?php _e( 'Welcome to your new WordPress site! ' ); ?></h3>
1293+
<h3><?php _e( 'Welcome to your new WordPress site!' ); ?></h3>
12941294
<p class="about-description"><?php _e( 'If you need help getting started, check out our documentation on <a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>. If you&#8217;d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?></p>
12951295
<div class="welcome-panel-column-container">
12961296
<div class="welcome-panel-column">

‎wp-admin/includes/file.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function list_files( $folder = '', $levels = 100 ) {
157157
* Please note that the calling function must unlink() this itself.
158158
*
159159
* The filename is based off the passed parameter or defaults to the current unix timestamp,
160-
* while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
160+
* while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
161161
*
162162
* @since 2.6.0
163163
*
@@ -486,7 +486,7 @@ function wp_handle_upload_error( &$file, $message ) {
486486

487487
/**
488488
* Downloads a url to a local temporary file using the WordPress HTTP Class.
489-
* Please note, That the calling function must unlink() the file.
489+
* Please note, That the calling function must unlink() the file.
490490
*
491491
* @since 2.5.0
492492
*
@@ -884,7 +884,7 @@ function get_filesystem_method($args = array(), $context = false) {
884884
}
885885

886886
/**
887-
* Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
887+
* Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
888888
* All chosen/entered details are saved, Excluding the Password.
889889
*
890890
* Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port.
@@ -896,7 +896,7 @@ function get_filesystem_method($args = array(), $context = false) {
896896
* @param string $form_post the URL to post the form to
897897
* @param string $type the chosen Filesystem method in use
898898
* @param boolean $error if the current request has failed to connect
899-
* @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
899+
* @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
900900
* @param string $extra_fields Extra POST fields which should be checked for to be included in the post.
901901
* @return boolean False on failure. True on success.
902902
*/

‎wp-admin/includes/meta-boxes.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function post_submit_meta_box($post) {
2727

2828
<div id="minor-publishing-actions">
2929
<div id="save-action">
30-
<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
30+
<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
3131
<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" tabindex="4" class="button button-highlighted" />
3232
<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
3333
<input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" tabindex="4" class="button button-highlighted" />
@@ -639,7 +639,7 @@ function link_submit_meta_box($link) {
639639
<div id="delete-action">
640640
<?php
641641
if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
642-
<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
642+
<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
643643
<?php } ?>
644644
</div>
645645

@@ -789,7 +789,7 @@ function link_xfn_meta_box($link) {
789789
<label for="contact">
790790
<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
791791
<label for="acquaintance">
792-
<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
792+
<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
793793
<label for="friend">
794794
<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
795795
<label for="friendship">
@@ -833,10 +833,10 @@ function link_xfn_meta_box($link) {
833833
<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
834834
<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
835835
<label for="child">
836-
<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />
836+
<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />
837837
<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
838838
<label for="kin">
839-
<input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />
839+
<input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />
840840
<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
841841
<label for="parent">
842842
<input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />
@@ -894,7 +894,7 @@ function link_advanced_meta_box($link) {
894894
</tr>
895895
<tr class="form-field">
896896
<th valign="top" scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
897-
<td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
897+
<td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
898898
</tr>
899899
<tr class="form-field">
900900
<th valign="top" scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>

‎wp-admin/includes/ms.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
115115
$index++;
116116
}
117117

118-
$stack = array_reverse( $stack ); // Last added dirs are deepest
118+
$stack = array_reverse( $stack ); // Last added dirs are deepest
119119
foreach( (array) $stack as $dir ) {
120120
if ( $dir != $top_dir)
121121
@rmdir( $dir );
@@ -430,7 +430,7 @@ function upload_space_setting( $id ) {
430430
function update_user_status( $id, $pref, $value, $deprecated = null ) {
431431
global $wpdb;
432432

433-
if ( null !== $deprecated )
433+
if ( null !== $deprecated )
434434
_deprecated_argument( __FUNCTION__, '3.1' );
435435

436436
$wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
@@ -549,7 +549,7 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
549549
$output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
550550
} else {
551551
$translated = format_code_lang( $code_lang );
552-
$output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
552+
$output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
553553
}
554554

555555
}
@@ -634,7 +634,7 @@ function choose_primary_blog() {
634634
<?php foreach( (array) $all_blogs as $blog ) {
635635
if ( $primary_blog == $blog->userblog_id )
636636
$found = true;
637-
?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
637+
?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
638638
} ?>
639639
</select>
640640
<?php
@@ -771,7 +771,7 @@ function _thickbox_path_admin_subfolder() {
771771
* Whether or not we have a large network.
772772
*
773773
* The default criteria for a large network is either more than 10,000 users or more than 10,000 sites.
774-
* Plugins can alter this criteria using the 'wp_is_large_network' filter.
774+
* Plugins can alter this criteria using the 'wp_is_large_network' filter.
775775
*
776776
* @since 3.3.0
777777
* @param string $using 'sites or 'users'. Default is 'sites'.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @since 3.0.0
88
* @uses Walker_Nav_Menu
99
*/
10-
class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
10+
class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
1111
/**
1212
* @see Walker_Nav_Menu::start_lvl()
1313
* @since 3.0.0
@@ -209,7 +209,7 @@ function start_el(&$output, $item, $depth, $args) {
209209
* @since 3.0.0
210210
* @uses Walker_Nav_Menu
211211
*/
212-
class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
212+
class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
213213
function __construct( $fields = false ) {
214214
if ( $fields ) {
215215
$this->db_fields = $fields;
@@ -990,7 +990,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
990990
(
991991
! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
992992
in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
993-
! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
993+
! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
994994
! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
995995
)
996996
) {

‎wp-admin/includes/plugin-install.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ function install_plugin_information() {
322322
<?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
323323
<li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
324324
<?php endif; if ( ! empty($api->homepage) ) : ?>
325-
<li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage &#187;') ?></a></li>
325+
<li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage &#187;') ?></a></li>
326326
<?php endif; ?>
327327
</ul>
328328
<?php if ( ! empty($api->rating) ) : ?>

‎wp-admin/includes/plugin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
882882

883883
$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
884884

885-
if ( null === $position )
885+
if ( null === $position )
886886
$menu[] = $new_menu;
887887
else
888888
$menu[$position] = $new_menu;
@@ -988,7 +988,7 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
988988
// as the first item in the submenu. If the submenu file is the same as the
989989
// parent file someone is trying to link back to the parent manually. In
990990
// this case, don't automatically add a link back to avoid duplication.
991-
if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
991+
if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
992992
foreach ( (array)$menu as $parent_menu ) {
993993
if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
994994
$submenu[$parent_slug][] = $parent_menu;

‎wp-admin/includes/post.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ function edit_post( $post_data = null ) {
171171
$post_data = _wp_translate_postdata( true, $post_data );
172172
if ( is_wp_error($post_data) )
173173
wp_die( $post_data->get_error_message() );
174-
if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] )
174+
if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] )
175175
$post_data['post_status'] = 'draft';
176176

177177
if ( isset($post_data['visibility']) ) {
@@ -352,7 +352,7 @@ function bulk_edit_posts( $post_data = null ) {
352352
$tax_names = get_object_taxonomies( $post );
353353
foreach ( $tax_names as $tax_name ) {
354354
$taxonomy_obj = get_taxonomy($tax_name);
355-
if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
355+
if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
356356
$new_terms = $tax_input[$tax_name];
357357
else
358358
$new_terms = array();

‎wp-admin/includes/screen.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function get_current_screen() {
196196
* @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
197197
* or an existing screen object.
198198
*/
199-
function set_current_screen( $hook_name = '' ) {
199+
function set_current_screen( $hook_name = '' ) {
200200
WP_Screen::get( $hook_name )->set_current_screen();
201201
}
202202

@@ -817,7 +817,7 @@ public function render_screen_options() {
817817
</div>
818818
<?php endif;
819819
if ( ! empty( $columns ) ) : ?>
820-
<h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
820+
<h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
821821
<div class="metabox-prefs">
822822
<?php
823823
$special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');

0 commit comments

Comments
 (0)