From 07c16fd23cd57a9217dbf34e7882180a13b85f0b Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Wed, 11 Dec 2013 19:49:11 +0000 Subject: [PATCH] The Pinking Shears stir from their slumber, awakened by what may seem, to those innocent in the ways of The Shears, a triviality, a nothing-of-consequence. But there are consequences indeed for recklessly trailing your whitespace. Naturally, they a dire! One, two! One, two! And through and through The Pinking Shears went snicker-snack! They plucked your tail and with your space They went sniksnuking back. Let me tell you, that can be uncomfortable, so always pre-sniksnuk your trailing whites. May The Shears be with you. Built from https://develop.svn.wordpress.org/trunk@26851 git-svn-id: http://core.svn.wordpress.org/trunk@26738 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/color-picker-rtl.css | 2 +- wp-admin/css/color-picker.css | 2 +- wp-admin/css/ie-rtl.css | 2 +- wp-admin/css/ie.css | 2 +- wp-admin/includes/class-wp-upgrader.php | 2 +- wp-admin/includes/plugin.php | 2 +- wp-admin/includes/theme.php | 2 +- wp-admin/js/post.js | 2 +- wp-admin/js/widgets.js | 4 ++-- wp-admin/themes.php | 2 +- wp-admin/update-core.php | 2 +- wp-includes/class-wp-image-editor-gd.php | 2 +- wp-includes/class-wp-image-editor-imagick.php | 4 ++-- wp-includes/formatting.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/wlwmanifest.xml | 12 ++++++------ 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/wp-admin/css/color-picker-rtl.css b/wp-admin/css/color-picker-rtl.css index 6d90e7d8f1..ac0b3c56fc 100644 --- a/wp-admin/css/color-picker-rtl.css +++ b/wp-admin/css/color-picker-rtl.css @@ -29,7 +29,7 @@ } .wp-color-result:after { - background: #f7f7f7; + background: #f7f7f7; border-radius: 2px 0 0 2px; border-right: 1px solid #ccc; color: #555; diff --git a/wp-admin/css/color-picker.css b/wp-admin/css/color-picker.css index 5fc95f5f56..320d1266a5 100644 --- a/wp-admin/css/color-picker.css +++ b/wp-admin/css/color-picker.css @@ -29,7 +29,7 @@ } .wp-color-result:after { - background: #f7f7f7; + background: #f7f7f7; border-radius: 0 2px 2px 0; border-left: 1px solid #ccc; color: #555; diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css index 8a6ff2cb9b..244e97df1e 100644 --- a/wp-admin/css/ie-rtl.css +++ b/wp-admin/css/ie-rtl.css @@ -212,7 +212,7 @@ ul#adminmenu { .theme-browser .theme .theme-screenshot { height: 180px; - min-width: + min-width: } .theme-browser .theme .theme-actions { diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index ca256f0ace..df3d7547d3 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -212,7 +212,7 @@ ul#adminmenu { .theme-browser .theme .theme-screenshot { height: 180px; - min-width: + min-width: } .theme-browser .theme .theme-actions { diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index d3fdf4bfa1..1d35c24818 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1902,7 +1902,7 @@ class WP_Automatic_Updater { // if the filesystem is unavailable, false is returned. if ( false === $upgrade_result ) { - $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) ); + $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) ); } // Core doesn't output this, so lets append it so we don't get confused diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index b163373433..8095cd4330 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -808,7 +808,7 @@ function delete_plugins($plugins, $redirect = '' ) { if ( $current = get_site_transient('update_plugins') ) { // Don't remove the plugins that weren't deleted. $deleted = array_diff( $plugins, $errors ); - + foreach ( $deleted as $plugin_file ) { unset( $current->response[ $plugin_file ] ); } diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index a3766c5b32..cc7c4545e6 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -311,7 +311,7 @@ function themes_api( $action, $args = null ) { * 'feature_list', or 'query_themes'. */ $args = apply_filters( 'themes_api_args', $args, $action ); - + /** * Filter whether to override the WordPress.org Themes API. * diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js index 51538521a9..35f56548d7 100644 --- a/wp-admin/js/post.js +++ b/wp-admin/js/post.js @@ -374,7 +374,7 @@ jQuery(document).ready( function($) { e.preventDefault(); } }).filter(':visible').find('.wp-tab-first').focus(); - + // Set the heartbeat interval to 15 sec. if post lock dialogs are enabled if ( typeof wp !== 'undefined' && wp.heartbeat && $('#post-lock-dialog').length ) { wp.heartbeat.interval( 15 ); diff --git a/wp-admin/js/widgets.js b/wp-admin/js/widgets.js index c1fd1f086c..046907b404 100644 --- a/wp-admin/js/widgets.js +++ b/wp-admin/js/widgets.js @@ -440,7 +440,7 @@ wpWidgets = { // No longer "new" widget widget.find( 'input.add_new' ).val(''); - /* + /* * Check if any part of the sidebar is visible in the viewport. If it is, don't scroll. * Otherwise, scroll up to so the sidebar is in view. * @@ -450,7 +450,7 @@ wpWidgets = { viewportTop = $(window).scrollTop(); viewportBottom = viewportTop + $(window).height(); sidebarBounds = sidebar.offset(); - + sidebarBounds.bottom = sidebarBounds.top + sidebar.outerHeight(); if ( viewportTop > sidebarBounds.bottom || viewportBottom < sidebarBounds.top ) { diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 5d4fa6f1d9..804a239e61 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -279,7 +279,7 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_ <# } #>
- + <# if ( data.active ) { #>

{{{ data.name }}}

<# } else { #> diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 06f6faa264..6153599689 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -490,7 +490,7 @@ get_current_screen()->set_help_sidebar( if ( 'upgrade-core' == $action ) { // Force a update check when requested $force_check = ! empty( $_GET['force-check'] ); - wp_version_check( array(), $force_check ); + wp_version_check( array(), $force_check ); require_once(ABSPATH . 'wp-admin/admin-header.php'); ?> diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index 4ee8be3c0f..fdd5586866 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -370,7 +370,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor { return new WP_Error( 'image_save_error', __('Image Editor Save Failed') ); } elseif ( 'image/jpeg' == $mime_type ) { - if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) ) + if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) ) return new WP_Error( 'image_save_error', __('Image Editor Save Failed') ); } else { diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php index d48213fa27..f3c9451ec3 100644 --- a/wp-includes/class-wp-image-editor-imagick.php +++ b/wp-includes/class-wp-image-editor-imagick.php @@ -119,7 +119,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file ); - /** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */ + /** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */ // Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) ); @@ -452,7 +452,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits @ chmod( $filename, $perms ); - /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */ + /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */ return array( 'path' => $filename, 'file' => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ), diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 3a3007701d..c56d82017e 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1867,7 +1867,7 @@ function translate_smiley( $matches ) { * @param string $smiley_url URL for the smiley image. * @param string $img Filename for the smiley image. * @param string $site_url Site URL, as returned by site_url(). - */ + */ $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() ); return sprintf( ' %s ', esc_url( $src_url ), esc_attr( $smiley ) ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e6f486ffa6..05acf4e1ec 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2250,7 +2250,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - + -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08); box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08); vertical-align: top; diff --git a/wp-includes/wlwmanifest.xml b/wp-includes/wlwmanifest.xml index 98504ee407..8e9b021ddb 100644 --- a/wp-includes/wlwmanifest.xml +++ b/wp-includes/wlwmanifest.xml @@ -7,7 +7,7 @@ Yes Yes - + WordPress images/wlw/wp-icon.png @@ -15,13 +15,13 @@ View site Dashboard - - @@ -32,7 +32,7 @@ Manage Comments images/wlw/wp-comments.png -