Trim trailing whitespace.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-06-11 20:19:35 +00:00
parent 5345acbf26
commit 5ecd1f31f2
8 changed files with 35 additions and 35 deletions

View File

@ -147,10 +147,10 @@ form#widgets-filter { /* fix widget page */
clear: both; clear: both;
float: none; float: none;
} }
#nav-menus-frame .open-label span { #nav-menus-frame .open-label span {
float: none; float: none;
display: inline-block; display: inline-block;
} }
#nav-menus-frame .delete-action { #nav-menus-frame .delete-action {
float: none; float: none;
} }

View File

@ -844,7 +844,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
// No parent as top level // No parent as top level
$_parent_pages[$menu_slug] = false; $_parent_pages[$menu_slug] = false;
return $hookname; return $hookname;
} }
@ -955,7 +955,7 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
// No parent as top level // No parent as top level
$_parent_pages[$menu_slug] = $parent_slug; $_parent_pages[$menu_slug] = $parent_slug;
return $hookname; 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. * 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 * If the slug hasn't been registered properly no url will be returned
* *
* @since 3.0 * @since 3.0
* *
* @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) * @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 * @param bool $echo Whether or not to echo the url - default is true
* @return string the url * @return string the url
*/ */
function menu_page_url($menu_slug, $echo = true) { function menu_page_url($menu_slug, $echo = true) {
global $_parent_pages; global $_parent_pages;
if ( isset( $_parent_pages[$menu_slug] ) ) { if ( isset( $_parent_pages[$menu_slug] ) ) {
if ( $_parent_pages[$menu_slug] ) { if ( $_parent_pages[$menu_slug] ) {
$url = admin_url($_parent_pages[$menu_slug] . '?page=' . $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 { } else {
$url = ''; $url = '';
} }
$url = esc_url($url); $url = esc_url($url);
if ( $echo ) if ( $echo )
echo $url; echo $url;
return $url; return $url;
} }

View File

@ -698,9 +698,9 @@ var wpNavMenu;
* Refreshes the menu tabs. * Refreshes the menu tabs.
* Will show and hide arrows where necessary. * Will show and hide arrows where necessary.
* Scrolls to the active tab by default. * Scrolls to the active tab by default.
* *
* @param savePosition {boolean} Optional. Prevents scrolling so * @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 ) { api.refreshMenuTabs = function( savePosition ) {
var fixedWidth = fixed.width(), var fixedWidth = fixed.width(),

View File

@ -266,7 +266,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
foreach ( (array) $descs as $desc ) foreach ( (array) $descs as $desc )
$term_to_ancestor[ $desc ] = $anc; $term_to_ancestor[ $desc ] = $anc;
} }
foreach ( $terms as $desc ) { foreach ( $terms as $desc ) {
do { do {
$possible_taxonomy_ancestors[ $taxonomy ][] = $desc; $possible_taxonomy_ancestors[ $taxonomy ][] = $desc;
@ -382,7 +382,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
// ancestral term // ancestral term
( (
'taxonomy' == $parent_item->type && '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 ] ) in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
) )
) )

View File

@ -747,16 +747,16 @@ function _wp_delete_tax_menu_item( $object_id = 0 ) {
*/ */
function _wp_menu_changing_status_observer( $new_status, $old_status, $post ) { 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 // append new top-level page objects to a menu for which that option is selected
if ( if (
'publish' == $new_status && 'publish' == $new_status &&
'publish' != $old_status && 'publish' != $old_status &&
'page' == $post->post_type && 'page' == $post->post_type &&
empty( $post->post_parent ) empty( $post->post_parent )
) { ) {
$auto_add = get_option( 'nav_menu_options' ); $auto_add = get_option( 'nav_menu_options' );
if ( if (
isset( $auto_add['auto_add'] ) && isset( $auto_add['auto_add'] ) &&
is_array( $auto_add['auto_add'] ) is_array( $auto_add['auto_add'] )
) { ) {
$args = array( $args = array(
'menu-item-object-id' => $post->ID, '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 ); 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) // 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 ) && ! empty( $post->ID ) &&
( (
( 'publish' == $old_status && 'draft' == $new_status ) || ( 'publish' == $old_status && 'draft' == $new_status ) ||
( 'draft' == $old_status && 'publish' == $new_status ) ( 'draft' == $old_status && 'publish' == $new_status )
) )
) { ) {
$menu_items = get_posts(array( $menu_items = get_posts(array(

View File

@ -1547,12 +1547,12 @@ function _custom_background_cb() {
if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) ) if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
$repeat = 'repeat'; $repeat = 'repeat';
$repeat = " background-repeat: $repeat;"; $repeat = " background-repeat: $repeat;";
$position = get_theme_mod( 'background_position_x', 'left' ); $position = get_theme_mod( 'background_position_x', 'left' );
if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) ) if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
$position = 'left'; $position = 'left';
$position = " background-position: top $position;"; $position = " background-position: top $position;";
$attachment = get_theme_mod( 'background_attachment', 'scroll' ); $attachment = get_theme_mod( 'background_attachment', 'scroll' );
if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) ) if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
$attachment = 'scroll'; $attachment = 'scroll';

View File

@ -212,9 +212,9 @@ function user_pass_ok($user_login, $user_pass) {
/** /**
* Get the current user's ID * Get the current user's ID
* *
* @since MU * @since MU
* *
* @uses wp_get_current_user * @uses wp_get_current_user
* *
* @return int The current user's ID * @return int The current user's ID

View File

@ -176,7 +176,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
<?php <?php
$blogs = get_blogs_of_user($current_user->ID); $blogs = get_blogs_of_user($current_user->ID);
if ( !empty($blogs) ) { ?> if ( !empty($blogs) ) { ?>
<p><?php _e( 'Sites you are already a member of:' ) ?></p> <p><?php _e( 'Sites you are already a member of:' ) ?></p>
<ul> <ul>
<?php foreach ( $blogs as $blog ) { <?php foreach ( $blogs as $blog ) {