From 5ecd1f31f206ea56f6c0470ee2165d3661ccbb95 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 11 Jun 2010 20:19:35 +0000 Subject: [PATCH] Trim trailing whitespace. git-svn-id: http://svn.automattic.com/wordpress/trunk@15235 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/ie-rtl.dev.css | 12 ++++++------ wp-admin/includes/plugin.php | 18 +++++++++--------- wp-admin/js/nav-menu.dev.js | 4 ++-- wp-includes/nav-menu-template.php | 4 ++-- wp-includes/nav-menu.php | 22 +++++++++++----------- wp-includes/theme.php | 4 ++-- wp-includes/user.php | 4 ++-- wp-signup.php | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/wp-admin/css/ie-rtl.dev.css b/wp-admin/css/ie-rtl.dev.css index 341d71d0cd..c35fc8945e 100644 --- a/wp-admin/css/ie-rtl.dev.css +++ b/wp-admin/css/ie-rtl.dev.css @@ -147,10 +147,10 @@ form#widgets-filter { /* fix widget page */ clear: both; float: none; } -#nav-menus-frame .open-label span { - float: none; - display: inline-block; -} -#nav-menus-frame .delete-action { - float: none; +#nav-menus-frame .open-label span { + float: none; + display: inline-block; +} +#nav-menus-frame .delete-action { + float: none; } diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 82e5c87e3c..ad5774df6f 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -844,7 +844,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func // No parent as top level $_parent_pages[$menu_slug] = false; - + return $hookname; } @@ -955,7 +955,7 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, // No parent as top level $_parent_pages[$menu_slug] = $parent_slug; - + return $hookname; } @@ -1173,18 +1173,18 @@ function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $ /** * Get the url to access a particular menu page based on the slug it was registered with. - * + * * If the slug hasn't been registered properly no url will be returned - * + * * @since 3.0 - * + * * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) * @param bool $echo Whether or not to echo the url - default is true * @return string the url */ function menu_page_url($menu_slug, $echo = true) { global $_parent_pages; - + if ( isset( $_parent_pages[$menu_slug] ) ) { if ( $_parent_pages[$menu_slug] ) { $url = admin_url($_parent_pages[$menu_slug] . '?page=' . $menu_slug); @@ -1194,12 +1194,12 @@ function menu_page_url($menu_slug, $echo = true) { } else { $url = ''; } - + $url = esc_url($url); - + if ( $echo ) echo $url; - + return $url; } diff --git a/wp-admin/js/nav-menu.dev.js b/wp-admin/js/nav-menu.dev.js index 89be9c6316..2df0a8d354 100644 --- a/wp-admin/js/nav-menu.dev.js +++ b/wp-admin/js/nav-menu.dev.js @@ -698,9 +698,9 @@ var wpNavMenu; * Refreshes the menu tabs. * Will show and hide arrows where necessary. * Scrolls to the active tab by default. - * + * * @param savePosition {boolean} Optional. Prevents scrolling so - * that the current position is maintained. Default false. + * that the current position is maintained. Default false. **/ api.refreshMenuTabs = function( savePosition ) { var fixedWidth = fixed.width(), diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index f54c99854a..db28208d45 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -266,7 +266,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) { foreach ( (array) $descs as $desc ) $term_to_ancestor[ $desc ] = $anc; } - + foreach ( $terms as $desc ) { do { $possible_taxonomy_ancestors[ $taxonomy ][] = $desc; @@ -382,7 +382,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) { // ancestral term ( 'taxonomy' == $parent_item->type && - isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) && + isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) && in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) ) ) diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index c61edc6db4..5efd41888f 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -747,16 +747,16 @@ function _wp_delete_tax_menu_item( $object_id = 0 ) { */ function _wp_menu_changing_status_observer( $new_status, $old_status, $post ) { // append new top-level page objects to a menu for which that option is selected - if ( - 'publish' == $new_status && - 'publish' != $old_status && - 'page' == $post->post_type && + if ( + 'publish' == $new_status && + 'publish' != $old_status && + 'page' == $post->post_type && empty( $post->post_parent ) ) { $auto_add = get_option( 'nav_menu_options' ); - if ( + if ( isset( $auto_add['auto_add'] ) && - is_array( $auto_add['auto_add'] ) + is_array( $auto_add['auto_add'] ) ) { $args = array( 'menu-item-object-id' => $post->ID, @@ -776,14 +776,14 @@ function _wp_menu_changing_status_observer( $new_status, $old_status, $post ) { wp_update_nav_menu_item( $menu_id, 0, $args ); } } - } - + } + // give menu items draft status if their associated post objects change from "publish" to "draft", or vice versa (draft item being re-published) - if ( + if ( ! empty( $post->ID ) && - ( + ( ( 'publish' == $old_status && 'draft' == $new_status ) || - ( 'draft' == $old_status && 'publish' == $new_status ) + ( 'draft' == $old_status && 'publish' == $new_status ) ) ) { $menu_items = get_posts(array( diff --git a/wp-includes/theme.php b/wp-includes/theme.php index ab46df65ae..6268f452a0 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1547,12 +1547,12 @@ function _custom_background_cb() { if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) ) $repeat = 'repeat'; $repeat = " background-repeat: $repeat;"; - + $position = get_theme_mod( 'background_position_x', 'left' ); if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) ) $position = 'left'; $position = " background-position: top $position;"; - + $attachment = get_theme_mod( 'background_attachment', 'scroll' ); if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) ) $attachment = 'scroll'; diff --git a/wp-includes/user.php b/wp-includes/user.php index 733f0b8401..66d5d2e960 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -212,9 +212,9 @@ function user_pass_ok($user_login, $user_pass) { /** * Get the current user's ID - * + * * @since MU - * + * * @uses wp_get_current_user * * @return int The current user's ID diff --git a/wp-signup.php b/wp-signup.php index 7e8a1311cd..cbea126889 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -176,7 +176,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { ID); if ( !empty($blogs) ) { ?> - +