Permalink
Browse files

Trim trailing whitespace

git-svn-id: http://svn.automattic.com/wordpress/trunk@13733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent d5296ed commit e25a65b36a900d9904a8776cfdf8be547939c2b5 ryan committed Mar 17, 2010
Showing with 260 additions and 260 deletions.
  1. +6 −6 wp-admin/admin-header.php
  2. +1 −1 wp-admin/css/install.dev.css
  3. +1 −1 wp-admin/edit-tags.php
  4. +1 −1 wp-admin/export.php
  5. +1 −1 wp-admin/includes/class-wp-upgrader.php
  6. +22 −22 wp-admin/includes/export.php
  7. +1 −1 wp-admin/includes/file.php
  8. +3 −3 wp-admin/includes/misc.php
  9. +4 −4 wp-admin/includes/ms.php
  10. +26 −26 wp-admin/includes/nav-menu.php
  11. +1 −1 wp-admin/includes/plugin.php
  12. +5 −5 wp-admin/includes/post.php
  13. +14 −14 wp-admin/includes/template.php
  14. +3 −3 wp-admin/includes/upgrade.php
  15. +2 −2 wp-admin/js/common.dev.js
  16. +1 −1 wp-admin/js/inline-edit-post.dev.js
  17. +40 −40 wp-admin/js/nav-menu.dev.js
  18. +2 −2 wp-admin/menu.php
  19. +3 −3 wp-admin/ms-edit.php
  20. +9 −9 wp-admin/ms-sites.php
  21. +1 −1 wp-admin/ms-users.php
  22. +18 −18 wp-admin/nav-menus.php
  23. +1 −1 wp-admin/network.php
  24. +1 −1 wp-admin/options.php
  25. +4 −4 wp-admin/plugins.php
  26. +5 −5 wp-admin/tools.php
  27. +1 −1 wp-admin/update-core.php
  28. +1 −1 wp-admin/update.php
  29. +1 −1 wp-admin/upload.php
  30. +1 −1 wp-includes/default-filters.php
  31. +10 −10 wp-includes/default-widgets.php
  32. +1 −1 wp-includes/formatting.php
  33. +1 −1 wp-includes/functions.php
  34. +1 −1 wp-includes/l10n.php
  35. +1 −1 wp-includes/link-template.php
  36. +27 −27 wp-includes/nav-menu-template.php
  37. +16 −16 wp-includes/nav-menu.php
  38. +1 −1 wp-includes/pluggable.php
  39. +8 −8 wp-includes/post.php
  40. +4 −4 wp-includes/query.php
  41. +2 −2 wp-includes/rewrite.php
  42. +7 −7 wp-includes/taxonomy.php
  43. +1 −1 wp-signup.php
View
@@ -35,15 +35,15 @@
//<![CDATA[
addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
var userSettings = {
- 'url': '<?php echo SITECOOKIEPATH; ?>',
+ 'url': '<?php echo SITECOOKIEPATH; ?>',
'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
'time':'<?php echo time() ?>'
},
- ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
- pagenow = '<?php echo $current_screen->id; ?>',
- typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
- adminpage = '<?php echo $admin_body_class; ?>',
- thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+ ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+ pagenow = '<?php echo $current_screen->id; ?>',
+ typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+ adminpage = '<?php echo $admin_body_class; ?>',
+ thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
//]]>
</script>
@@ -53,7 +53,7 @@ abbr {
margin: 6px 0 14px 0;
border-bottom: none;
text-align:center
-}
+}
.step {
margin: 20px 0 15px;
View
@@ -305,7 +305,7 @@
</div>
<?php elseif ( 'post_tag' == $taxonomy ) : ?>
<div class="form-wrap">
-<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p>
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p>
</div>
<?php endif;
do_action('after-' . $taxonomy . '-table', $taxonomy);
View
@@ -49,7 +49,7 @@
$months = "";
for ( $i = 1; $i < 13; $i++ ) {
- $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' .
+ $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' .
$wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) . "</option>\n";
} ?>
@@ -1086,7 +1086,7 @@ function footer() {
function error($error) {
if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
$this->error = $this->upgrader->strings[$error];
-
+
if ( is_wp_error($error) && $error->get_error_code() ) {
foreach ( $error->get_error_messages() as $emessage ) {
if ( $error->get_error_data() )
@@ -38,28 +38,28 @@ function export_wp($author='', $category='', $post_type='', $status='', $start_d
header("Content-Disposition: attachment; filename=$filename");
header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
-if ( $post_type and $post_type != 'all' ) {
- $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
-} else {
- $where = "WHERE post_type != 'revision' ";
-}
-if ( $author and $author != 'all' ) {
- $author_id = (int) $author;
- $where .= $wpdb->prepare("AND post_author = %d ", $author_id);
-}
-if ( $start_date and $start_date != 'all' ) {
- $where .= $wpdb->prepare("AND post_date >= %s ", $start_date);
-}
-if ( $end_date and $end_date != 'all' ) {
- $where .= $wpdb->prepare("AND post_date < %s ", $end_date);
-}
-if ( $category and $category != 'all' ) {
- $taxomony_id = (int) $category;
- $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id);
-}
-if ( $status and $status != 'all' ) {
- $where .= $wpdb->prepare("AND post_status = %s ", $status);
-}
+if ( $post_type and $post_type != 'all' ) {
+ $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
+} else {
+ $where = "WHERE post_type != 'revision' ";
+}
+if ( $author and $author != 'all' ) {
+ $author_id = (int) $author;
+ $where .= $wpdb->prepare("AND post_author = %d ", $author_id);
+}
+if ( $start_date and $start_date != 'all' ) {
+ $where .= $wpdb->prepare("AND post_date >= %s ", $start_date);
+}
+if ( $end_date and $end_date != 'all' ) {
+ $where .= $wpdb->prepare("AND post_date < %s ", $end_date);
+}
+if ( $category and $category != 'all' ) {
+ $taxomony_id = (int) $category;
+ $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id);
+}
+if ( $status and $status != 'all' ) {
+ $where .= $wpdb->prepare("AND post_status = %s ", $status);
+}
// grab a snapshot of post IDs, just in case it changes during the export
$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
@@ -313,7 +313,7 @@ function wp_handle_upload_error( &$file, $message ) {
// A writable uploads dir will pass this test. Again, there's no point overriding this one.
if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
- return call_user_func($upload_error_handler, $file, $uploads['error'] );
+ return call_user_func($upload_error_handler, $file, $uploads['error'] );
$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
@@ -656,15 +656,15 @@ function win_is_writable($path) {
/**
* Send a HTTP header to disable content type sniffing in browsers which support it.
- *
+ *
* @link http://blogs.msdn.com/ie/archive/2008/07/02/ie8-security-part-v-comprehensive-protection.aspx
* @link http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
- *
+ *
* @since 3.0.0.
* @return none
*/
function send_nosniff_header() {
- @header( 'X-Content-Type-Options: nosniff' );
+ @header( 'X-Content-Type-Options: nosniff' );
}
/**
* Display the default admin color scheme picker (Used in user-edit.php)
View
@@ -168,7 +168,7 @@ function confirm_delete_users( $users ) {
global $current_user;
if ( !is_array( $users ) )
return false;
-
+
screen_icon('tools');
?>
<h2><?php esc_html_e('Users'); ?></h2>
@@ -183,13 +183,13 @@ function confirm_delete_users( $users ) {
foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
if ( $val != '' && $val != '0' ) {
$delete_user = new WP_User( $val );
-
+
if ( in_array( $delete_user->user_login, $site_admins ) )
wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) );
-
+
echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
$blogs = get_blogs_of_user( $val, true );
-
+
if ( !empty( $blogs ) ) {
echo '<p><strong>' . sprintf( __( 'Sites from %s:' ), $delete_user->user_login ) . '</strong></p>';
foreach ( (array) $blogs as $key => $details ) {
@@ -13,7 +13,7 @@
*/
function wp_nav_menu_post_type_metaboxes() {
$post_types = get_post_types( array( 'public' => true ), 'object' );
-
+
if ( !$post_types )
return false;
@@ -99,10 +99,10 @@ function wp_nav_menu_create_metabox() { ?>
*/
function wp_nav_menu_item_link_metabox() {
$args = array( 'post_status' => 'any', 'post_type' => 'nav_menu_item', 'meta_value' => 'custom', 'showposts' => -1 );
-
+
// @todo transient caching of these results with proper invalidation on updating links
$query = new WP_Query( $args );
-
+
?>
<p id="menu-item-url-wrap">
<label class="howto" for="menu-item-url">
@@ -117,7 +117,7 @@ function wp_nav_menu_item_link_metabox() {
<input id="custom-menu-item-name" name="custom-menu-item-name" type="text" class="regular-text menu-item-textbox" value="<?php echo esc_attr( __('Menu Item') ); ?>" />
</label>
</p>
-
+
<p class="button-controls">
<a class="show-all"><?php _e('View All'); ?></a>
<a class="hide-all"><?php _e('Hide All'); ?></a>
@@ -146,16 +146,16 @@ function wp_nav_menu_item_link_metabox() {
*/
function wp_nav_menu_item_post_type_metabox( $object, $post_type ) {
$args = array( 'post_type' => $post_type['args']->name, 'post_status' => 'publish', 'showposts' => -1 );
-
+
if ( 'attachment' == $post_type['args']->name )
$args['post_status'] = 'any';
-
+
// @todo transient caching of these results with proper invalidation on updating of a post of this type
$query = new WP_Query( $args );
-
+
if ( !$query->posts )
$error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>';
-
+
$pt_names = '';
if ( is_array($query->posts) ) {
foreach ( $query->posts as $post ) {
@@ -166,19 +166,19 @@ function wp_nav_menu_item_post_type_metabox( $object, $post_type ) {
}
}
}
-
+
$id = $post_type['args']->name;
?>
<p class="quick-search-wrap">
<input type="text" class="quick-search regular-text" value="" />
<a class="quick-search-submit button-secondary"><?php _e('Search'); ?></a>
</p>
-
+
<p class="button-controls">
<a class="show-all"><?php _e('View All'); ?></a>
<a class="hide-all"><?php _e('Hide All'); ?></a>
</p>
-
+
<div id="existing-<?php echo esc_attr( $id ); ?>" class="list-wrap">
<div class="list-container">
<ul class="list">
@@ -218,10 +218,10 @@ function wp_nav_menu_item_taxonomy_metabox( $object, $taxonomy ) {
// @todo transient caching of these results with proper invalidation on updating of a tax of this type
$terms = get_terms( $taxonomy['args']->name, $args );
-
+
if ( !$terms )
$error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>';
-
+
$term_names = '';
if ( is_array($terms) ) {
foreach ( $terms as $term ) {
@@ -232,19 +232,19 @@ function wp_nav_menu_item_taxonomy_metabox( $object, $taxonomy ) {
}
}
}
-
+
$id = $taxonomy['args']->name;
?>
<p class="quick-search-wrap">
<input type="text" class="quick-search regular-text" value="" />
<a class="quick-search-submit button-secondary"><?php _e('Search'); ?></a>
</p>
-
+
<p class="button-controls">
<a class="show-all"><?php _e('View All'); ?></a>
<a class="hide-all"><?php _e('Hide All'); ?></a>
</p>
-
+
<div id="existing-<?php echo esc_attr( $id ); ?>" class="list-wrap">
<div class="list-container">
<ul class="list">
@@ -281,24 +281,24 @@ function wp_nav_menu_item_taxonomy_metabox( $object, $taxonomy ) {
function wp_nav_menu_get_items( $menu_items, $object_type, $object = null, $context = 'frontend' ) {
if ( !$menu_items )
return __( 'Not Found' );
-
+
$output = '';
$i = 1;
foreach ( $menu_items as $menu_item ) {
// convert the 'parent' taxonomy property to 'post_parent'
// so we don't have to duplicate this entire function.
if ( !isset($menu_item->post_parent) )
$menu_item->post_parent = $menu_item->parent;
-
+
// Cleanest way to get all attachements
if ( 'attachment' == $object )
$menu_item->post_parent = 0;
-
+
if ( 0 == $menu_item->post_parent ) {
// Set up the menu item
- $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
+ $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
$attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
-
+
$output .= '<li'. $attributes .'>';
$output .= wp_get_nav_menu_item( $menu_item, $object_type, $object );
$output .= wp_get_nav_menu_sub_items( $menu_item->ID, $object_type, $object, $context );
@@ -307,7 +307,7 @@ function wp_nav_menu_get_items( $menu_items, $object_type, $object = null, $cont
++$i;
}
}
-
+
return $output;
}
@@ -323,7 +323,7 @@ function wp_nav_menu_get_items( $menu_items, $object_type, $object = null, $cont
*/
function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $context = 'frontend' ) {
$args = array( 'child_of' => $childof, 'parent' => $childof, 'hide_empty' => false, );
-
+
switch ( $object_type ) {
case 'post_type':
$hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
@@ -334,20 +334,20 @@ function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $con
$sub_menu_items = array();
}
break;
-
+
case 'taxonomy':
if ( is_taxonomy_hierarchical( $object ) ) {
$sub_menu_items = get_terms( $object, $args );
} else {
$sub_menu_items = array();
}
break;
-
+
default:
$sub_menu_items = array();
break;
}
-
+
$output = '';
$i = 1;
if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) {
@@ -557,7 +557,7 @@ function deactivate_plugins( $plugins, $silent = false ) {
*
* @param string|array $plugins
* @param string $redirect Redirect to page after successful activation.
- * @param bool $network_wide Whether to enable the plugin for all sites in the network.
+ * @param bool $network_wide Whether to enable the plugin for all sites in the network.
* @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
*/
function activate_plugins($plugins, $redirect = '', $network_wide) {
View
@@ -270,15 +270,15 @@ function bulk_edit_posts( $post_data = null ) {
else
unset($post_data['post_category']);
}
-
+
$tax_input = array();
if ( isset($post_data['tax_input'])) {
foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
if ( empty($terms) )
continue;
$taxonomy = get_taxonomy( $tax_name );
if ( $taxonomy->hierarchical )
- $tax_input[$tax_name] = array_map( 'absint', $terms );
+ $tax_input[$tax_name] = array_map( 'absint', $terms );
else {
$tax_input[$tax_name] = preg_replace( '/\s*,\s*/', ',', rtrim( trim($terms), ' ,' ) );
$tax_input[$tax_name] = explode(',', $tax_input[$tax_name]);
@@ -314,14 +314,14 @@ function bulk_edit_posts( $post_data = null ) {
$locked[] = $post_ID;
continue;
}
-
+
$tax_names = get_object_taxonomies( get_post($post_ID) );
-
+
if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
$cats = (array) wp_get_post_categories($post_ID);
$post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
}
-
+
foreach ( $tax_names as $tax_name ) {
if( isset( $tax_input[$tax_name]) ) {
$taxonomy = get_taxonomy( $tax_name );
Oops, something went wrong.

0 comments on commit e25a65b

Please sign in to comment.