From 7b7243d94a2c4da991e26e4df803ec2bffda9918 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 3 May 2010 20:26:11 +0000 Subject: [PATCH] Strip trailing whites. git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-ajax.php | 12 +-- wp-admin/css/ms.dev.css | 4 +- wp-admin/css/nav-menu-rtl.dev.css | 26 ++--- wp-admin/css/nav-menu.dev.css | 38 +++---- wp-admin/css/press-this.dev.css | 2 +- wp-admin/css/wp-admin.dev.css | 4 +- wp-admin/custom-background.php | 4 +- wp-admin/includes/file.php | 6 +- wp-admin/includes/media.php | 4 +- wp-admin/includes/meta-boxes.php | 2 +- wp-admin/includes/ms.php | 6 +- wp-admin/includes/nav-menu.php | 156 +++++++++++++-------------- wp-admin/includes/post.php | 2 +- wp-admin/includes/template.php | 4 +- wp-admin/includes/theme.php | 14 +-- wp-admin/js/common.dev.js | 8 +- wp-admin/js/custom-background.dev.js | 2 +- wp-admin/js/nav-menu.dev.js | 140 ++++++++++++------------ wp-admin/js/theme-preview.dev.js | 2 +- wp-admin/ms-delete-site.php | 2 +- wp-admin/ms-edit.php | 22 ++-- wp-admin/ms-options.php | 2 +- wp-admin/ms-users.php | 4 +- wp-admin/my-sites.php | 2 +- wp-admin/nav-menus.php | 48 ++++----- wp-admin/press-this.php | 2 +- wp-admin/setup-config.php | 6 +- wp-includes/canonical.php | 2 +- wp-includes/capabilities.php | 4 +- wp-includes/category-template.php | 2 +- wp-includes/class-http.php | 2 +- wp-includes/class-oembed.php | 2 +- wp-includes/comment-template.php | 2 +- wp-includes/formatting.php | 4 +- wp-includes/functions.php | 2 +- wp-includes/locale.php | 2 +- wp-includes/ms-functions.php | 2 +- wp-includes/nav-menu-template.php | 12 +-- wp-includes/nav-menu.php | 64 +++++------ wp-includes/post.php | 4 +- wp-includes/query.php | 4 +- wp-includes/rewrite.php | 2 +- wp-includes/taxonomy.php | 4 +- wp-includes/theme.php | 4 +- wp-includes/widgets.php | 8 +- 45 files changed, 325 insertions(+), 325 deletions(-) diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 3341fd679..c4a3f0736 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -134,7 +134,7 @@ case 'imgedit-preview' : case 'menu-quick-search': if ( ! current_user_can( 'switch_themes' ) ) die('-1'); - + require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; _wp_ajax_menu_quick_search( $_REQUEST ); @@ -399,7 +399,7 @@ case 'delete-link' : case 'delete-menu-item' : $menu_item_id = (int) $_POST['menu-item']; check_admin_referer( 'delete-menu_item_' . $menu_item_id ); - if ( ! current_user_can( 'switch_themes' ) ) + if ( ! current_user_can( 'switch_themes' ) ) die('-1'); if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) @@ -827,12 +827,12 @@ case 'add-menu-item' : $menu_id = (int) $_POST['menu']; if ( isset( $_POST['menu-item'] ) ) { $item_ids = wp_save_nav_menu_item( $menu_id, $_POST['menu-item'] ); - if ( is_wp_error( $item_ids ) ) + if ( is_wp_error( $item_ids ) ) die('-1'); } else { $item_ids = array(); } - + foreach ( (array) $item_ids as $menu_item_id ) { $menu_obj = get_post( $menu_item_id ); if ( ! empty( $menu_obj->ID ) ) { @@ -847,7 +847,7 @@ case 'add-menu-item' : 'context' => 'backend', 'link_after' => '', 'link_before' => '', - 'walker' => new Walker_Nav_Menu_Edit, + 'walker' => new Walker_Nav_Menu_Edit, ); echo walk_nav_menu_tree( $menu_items, 0, (object) $args ); } @@ -1093,7 +1093,7 @@ case 'hidden-columns' : case 'menu-quick-search': if ( ! current_user_can( 'switch_themes' ) ) die('-1'); - + require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; _wp_ajax_menu_quick_search( $_REQUEST ); diff --git a/wp-admin/css/ms.dev.css b/wp-admin/css/ms.dev.css index 16fc947de..4b2b79709 100644 --- a/wp-admin/css/ms.dev.css +++ b/wp-admin/css/ms.dev.css @@ -9,8 +9,8 @@ font-size: 16px; } -#dashboard_right_now div.musubtable { - border-top: none; +#dashboard_right_now div.musubtable { + border-top: none; } /* No drag and drop on ms-sites.php */ diff --git a/wp-admin/css/nav-menu-rtl.dev.css b/wp-admin/css/nav-menu-rtl.dev.css index 3ea29a28d..5e9fbbbbd 100644 --- a/wp-admin/css/nav-menu-rtl.dev.css +++ b/wp-admin/css/nav-menu-rtl.dev.css @@ -1,14 +1,14 @@ -.howto span { - float: right; +.howto span { + float: right; } -.menu-item-textbox { - float: left; +.menu-item-textbox { + float: left; } -.add-to-menu { - float: left; +.add-to-menu { + float: left; } .menu-item-title input[type="checkbox"] { - margin-left: 3px; + margin-left: 3px; } .menu li dl dt { padding-left: 0; @@ -16,17 +16,17 @@ } .menu li ul li { margin-left: 0; - margin-right: 20px; + margin-right: 20px; } -.menu li .item-title { +.menu li .item-title { margin-right: 0; - margin-left: 18em; + margin-left: 18em; } -.item-controls { +.item-controls { right: auto; - left: 15px; + left: 15px; } .item-type { padding-right: 0; - padding-left: 10px; + padding-left: 10px; } \ No newline at end of file diff --git a/wp-admin/css/nav-menu.dev.css b/wp-admin/css/nav-menu.dev.css index c1ee9fb9e..c56781741 100644 --- a/wp-admin/css/nav-menu.dev.css +++ b/wp-admin/css/nav-menu.dev.css @@ -55,12 +55,12 @@ body { #menu-management .menu-edit { margin-bottom: 20px; } - + #nav-menu-header, #post-body { border-color: #ccc; border-style: solid; } - + #nav-menu-header { background: url("../images/gray-grad.png") repeat-x scroll left top #dfdfdf; border-width: 1px 1px 0 1px; @@ -73,7 +73,7 @@ body { -khtml-border-top-right-radius: 6px; border-top-right-radius: 6px; } - + #post-body { background: #fff; padding:0 0 10px 10px; @@ -87,11 +87,11 @@ body { -khtml-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; } - + #post-body-content { position: relative; } - + .post-body-plain { padding: 10px 10px 0 0; } @@ -99,9 +99,9 @@ body { #menu-management .menu-add-new abbr { font-weight:bold; } - + /* Menu Tabs */ - + #menu-management .nav-tabs-nav { margin: 0 20px; } @@ -162,12 +162,12 @@ body { text-align: right; padding: 0 10px 3px 10px; margin-bottom: 5px; -} +} #select-nav-menu { width: 100px; display: inline; } - + /* Menu Toolbar */ #menu-management #major-publishing-actions #delete-action { float: right; @@ -184,7 +184,7 @@ body { #wpbody .open-label span { padding-right: 10px; } - + .js .input-with-default-title { color: #aaa; font-style: italic; @@ -210,7 +210,7 @@ body { /* Button Secondary Actions */ .list-controls { float: left; margin-top: 5px; } -.add-to-menu { +.add-to-menu { float: right; } @@ -265,7 +265,7 @@ body { .menu ul { width: 100%; } .menu ul.sub-menu { } -.menu li { +.menu li { margin-bottom: 0; } .menu li dl { @@ -276,12 +276,12 @@ body { } .menu li dl dt { background: url("../images/gray-grad.png") repeat-x scroll left top #DFDFDF; - border: 1px solid #E6E6E6; + border: 1px solid #E6E6E6; clear:both; - position: relative; + position: relative; padding-left: 10px; height: auto; - width: 400px; + width: 400px; line-height: 35px; text-shadow: 0 1px 0 #FFFFFF; font-weight:bold; @@ -289,7 +289,7 @@ body { } .menu li dl.menu-item-edit-inactive dt { border-radius: 6px; - -webkit-border-radius: 6px; + -webkit-border-radius: 6px; -moz-border-radius: 6px; -khtml-border-radius: 6px; } @@ -311,7 +311,7 @@ body { background-color:#faa; } -.menu li .item-title { +.menu li .item-title { padding: 7px 0; line-height: 20px; display:block; @@ -424,9 +424,9 @@ body.js .item-order { font-size: 11px; color: #777; font-style: italic; - border: 1px solid #dfdfdf; + border: 1px solid #dfdfdf; border-radius: 6px; - -webkit-border-radius: 6px; + -webkit-border-radius: 6px; -moz-border-radius: 6px; -khtml-border-radius: 6px; } diff --git a/wp-admin/css/press-this.dev.css b/wp-admin/css/press-this.dev.css index 4576ee985..a72ea3e62 100644 --- a/wp-admin/css/press-this.dev.css +++ b/wp-admin/css/press-this.dev.css @@ -316,7 +316,7 @@ h3.tb { font-size: 12px; margin: 1px; } - + .category-add select { width: 100%; -x-system-font: none; diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css index f035bb6bd..d0edaa8cc 100644 --- a/wp-admin/css/wp-admin.dev.css +++ b/wp-admin/css/wp-admin.dev.css @@ -2014,11 +2014,11 @@ input#link_url { } div.tabs-panel-active { - display:block; + display:block; } div.tabs-panel-inactive { - display:none; + display:none; } #post-body .categorydiv div.tabs-panel, diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index f44b9eff1..fd5cd0392 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -154,7 +154,7 @@ class Custom_Background { - +

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index c3f4c0ab9..1f810939b 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -641,7 +641,7 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { continue; if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files - continue; + continue; $contents = $z->getFromIndex($i); if ( false === $contents ) @@ -685,9 +685,9 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) { // Determine any children directories needed (From within the archive) foreach ( $archive_files as $file ) { - if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory + if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory continue; - + $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) ); } diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 7f6fb498d..1ffcf1aab 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -2160,7 +2160,7 @@ function type_url_form_file() { function _insert_into_post_button($type) { if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') ) return ''; - + if ( 'image' == $type ) return ' @@ -2168,7 +2168,7 @@ function _insert_into_post_button($type) { - + '; return ' diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 3d4e586a4..3219380c2 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -248,7 +248,7 @@ function post_tags_meta_box($post, $box) { $help_hint = isset( $taxonomy->help_hint ) ? $taxonomy->help_hint : __('Add new tag'); $help_nojs = isset( $taxonomy->help_nojs ) ? $taxonomy->help_nojs : __('Add or remove tags'); $help_cloud = isset( $taxonomy->help_cloud ) ? $taxonomy->help_cloud : __('Choose from the most used tags in %s'); - + $disabled = !current_user_can($taxonomy->assign_cap) ? 'disabled="disabled"' : ''; ?>
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 5a910fcdc..d1651d1bb 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -452,7 +452,7 @@ function display_space_usage() { /* translators: Gigabytes */ $space .= __( 'GB' ); } else { - /* translators: Megabytes */ + /* translators: Megabytes */ $space .= __( 'MB' ); } ?> @@ -546,7 +546,7 @@ function refresh_user_details( $id ) { function format_code_lang( $code = '' ) { $code = strtolower( substr( $code, 0, 2 ) ); - $lang_codes = array( + $lang_codes = array( 'aa' => 'Afar', 'ab' => 'Abkhazian', 'af' => 'Afrikaans', 'ak' => 'Akan', 'sq' => 'Albanian', 'am' => 'Amharic', 'ar' => 'Arabic', 'an' => 'Aragonese', 'hy' => 'Armenian', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'eu' => 'Basque', 'be' => 'Belarusian', 'bn' => 'Bengali', 'bh' => 'Bihari', 'bi' => 'Bislama', 'bs' => 'Bosnian', 'br' => 'Breton', 'bg' => 'Bulgarian', 'my' => 'Burmese', 'ca' => 'Catalan; Valencian', 'ch' => 'Chamorro', 'ce' => 'Chechen', 'zh' => 'Chinese', 'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree', 'cs' => 'Czech', 'da' => 'Danish', 'dv' => 'Divehi; Dhivehi; Maldivian', 'nl' => 'Dutch; Flemish', 'dz' => 'Dzongkha', 'en' => 'English', 'eo' => 'Esperanto', 'et' => 'Estonian', 'ee' => 'Ewe', 'fo' => 'Faroese', 'fj' => 'Fijjian', 'fi' => 'Finnish', 'fr' => 'French', 'fy' => 'Western Frisian', 'ff' => 'Fulah', 'ka' => 'Georgian', 'de' => 'German', 'gd' => 'Gaelic; Scottish Gaelic', @@ -630,7 +630,7 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) { if ( $code_lang == 'en_US' ) { // American English $flag = true; - $ae = __( 'American English' ); + $ae = __( 'American English' ); $output[$ae] = ''; } elseif ( $code_lang == 'en_GB' ) { // British English $flag = true; diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index d0588f17f..02eb66ca8 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -16,7 +16,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * @param int $depth Depth of page. */ function start_lvl(&$output, $depth) {} - + /** * @see Walker_Nav_Menu::end_lvl() * @since 3.0.0 @@ -25,7 +25,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * @param int $depth Depth of page. */ function end_lvl(&$output, $depth) {} - + /** * @see Walker::start_el() * @since 3.0.0 @@ -49,7 +49,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { 'page-tab', '_wpnonce', ); - + $original_title = ''; if ( 'taxonomy' == $item->type ) { $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' ); @@ -59,7 +59,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { } ?>
$offset, + $args = array( + 'offset' => $offset, 'order' => 'ASC', - 'orderby' => 'title', - 'posts_per_page' => $per_page, - 'post_type' => $post_type_name, - 'suppress_filters' => true, + 'orderby' => 'title', + 'posts_per_page' => $per_page, + 'post_type' => $post_type_name, + 'suppress_filters' => true, ); if ( isset( $post_type['args']->_default_query ) ) @@ -511,7 +511,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { } $parent_ids = array_unique($parent_ids); $child_ids = array_unique($child_ids); - + $missing_parents = array(); do { foreach( (array) $missing_parents as $missing_parent_id ) { @@ -520,27 +520,27 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { $child_ids[] = $missing_parent_id; $parent_ids[] = $missing_parent->post_parent; } - + $missing_parents = array_filter( array_diff( array_unique( $parent_ids ), array_unique( $child_ids ) ) ); } while( 0 < count( $missing_parents ) ); - + } $page_links = paginate_links( array( - 'base' => add_query_arg( + 'base' => add_query_arg( array( $post_type_name . '-tab' => 'all', 'paged' => '%#%', ) ), - 'format' => '', + 'format' => '', 'prev_text' => __('«'), 'next_text' => __('»'), 'total' => $num_pages, 'current' => $pagenum )); - + if ( !$posts ) $error = '
  • '. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'
    • '; @@ -554,7 +554,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { } $removed_args = array( - 'action', + 'action', 'customlink-tab', 'edit-menu-item', 'menu-item', @@ -569,10 +569,10 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
  • >
    • -
    " id="tabs-panel-posttype--search"> - $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) ); @@ -614,7 +614,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) { $checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items); - + } echo $checkbox_items; ?> @@ -627,7 +627,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {

    - 'all', @@ -669,35 +669,35 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0; $args = array( - 'child_of' => 0, + 'child_of' => 0, 'exclude' => '', - 'hide_empty' => false, - 'hierarchical' => 1, - 'include' => '', - 'include_last_update_time' => false, - 'number' => $per_page, + 'hide_empty' => false, + 'hierarchical' => 1, + 'include' => '', + 'include_last_update_time' => false, + 'number' => $per_page, 'offset' => $offset, 'order' => 'ASC', - 'orderby' => 'name', + 'orderby' => 'name', 'pad_counts' => false, ); $num_pages = ceil( $term_count / $per_page ); $page_links = paginate_links( array( - 'base' => add_query_arg( + 'base' => add_query_arg( array( $taxonomy_name . '-tab' => 'all', 'paged' => '%#%', ) ), - 'format' => '', + 'format' => '', 'prev_text' => __('«'), 'next_text' => __('»'), 'total' => $num_pages, 'current' => $pagenum )); - + $walker = new Walker_Nav_Menu_Checklist; // @todo transient caching of these results with proper invalidation on updating of a tax of this type $terms = get_terms( $taxonomy_name, $args ); @@ -715,7 +715,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { } $removed_args = array( - 'action', + 'action', 'customlink-tab', 'edit-menu-item', 'menu-item', @@ -740,15 +740,15 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { $args['walker'] = $walker; echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args ); ?> -

    -
    " id="tabs-panel-search-taxonomy-"> - $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) ); @@ -761,7 +761,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {

    - +