<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26851] trunk/src: The Pinking Shears stir from their slumber, awakened by what may seem, to those </title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26851">26851</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2013-12-11 19:48:29 +0000 (Wed, 11 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscolorpickercss">trunk/src/wp-admin/css/color-picker.css</a></li>
<li><a href="#trunksrcwpadmincssiecss">trunk/src/wp-admin/css/ie.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpadminjswidgetsjs">trunk/src/wp-admin/js/widgets.js</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorimagickphp">trunk/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludeswlwmanifestxml">trunk/src/wp-includes/wlwmanifest.xml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscolorpickercss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/color-picker.css (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/color-picker.css  2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/css/color-picker.css     2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .wp-color-result:after {
</span><del>-       background: #f7f7f7;    
</del><ins>+        background: #f7f7f7;
</ins><span class="cx">   border-radius: 0 2px 2px 0;
</span><span class="cx">  border-left: 1px solid #ccc;
</span><span class="cx">  color: #555;
</span></span></pre></div>
<a id="trunksrcwpadmincssiecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/ie.css (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/ie.css    2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/css/ie.css       2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> 
</span><span class="cx"> .theme-browser .theme .theme-screenshot {
</span><span class="cx">  height: 180px;
</span><del>-       min-width: 
</del><ins>+        min-width:
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-browser .theme .theme-actions {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php        2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php   2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -1902,7 +1902,7 @@
</span><span class="cx"> 
</span><span class="cx">          // if the filesystem is unavailable, false is returned.
</span><span class="cx">          if ( false === $upgrade_result ) {
</span><del>-                       $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );                       
</del><ins>+                        $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
</ins><span class="cx">           }
</span><span class="cx"> 
</span><span class="cx">          // Core doesn't output this, so lets append it so we don't get confused
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/plugin.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/plugin.php   2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/includes/plugin.php      2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -808,7 +808,7 @@
</span><span class="cx">  if ( $current = get_site_transient('update_plugins') ) {
</span><span class="cx">          // Don't remove the plugins that weren't deleted.
</span><span class="cx">          $deleted = array_diff( $plugins, $errors );
</span><del>-               
</del><ins>+
</ins><span class="cx">           foreach ( $deleted as $plugin_file ) {
</span><span class="cx">                  unset( $current->response[ $plugin_file ] );
</span><span class="cx">          }
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/theme.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/theme.php    2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/includes/theme.php       2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">   *                       'feature_list', or 'query_themes'.
</span><span class="cx">          */
</span><span class="cx">  $args = apply_filters( 'themes_api_args', $args, $action );
</span><del>-       
</del><ins>+
</ins><span class="cx">   /**
</span><span class="cx">   * Filter whether to override the WordPress.org Themes API.
</span><span class="cx">   *
</span></span></pre></div>
<a id="trunksrcwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/post.js (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/post.js    2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/js/post.js       2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">                  e.preventDefault();
</span><span class="cx">          }
</span><span class="cx">  }).filter(':visible').find('.wp-tab-first').focus();
</span><del>-       
</del><ins>+
</ins><span class="cx">   // Set the heartbeat interval to 15 sec. if post lock dialogs are enabled
</span><span class="cx">  if ( typeof wp !== 'undefined' && wp.heartbeat && $('#post-lock-dialog').length ) {
</span><span class="cx">          wp.heartbeat.interval( 15 );
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/widgets.js (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/widgets.js 2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/js/widgets.js    2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx">          // No longer "new" widget
</span><span class="cx">          widget.find( 'input.add_new' ).val('');
</span><span class="cx"> 
</span><del>-               /* 
</del><ins>+                /*
</ins><span class="cx">            * Check if any part of the sidebar is visible in the viewport. If it is, don't scroll.
</span><span class="cx">           * Otherwise, scroll up to so the sidebar is in view.
</span><span class="cx">           *
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx">          viewportTop = $(window).scrollTop();
</span><span class="cx">          viewportBottom = viewportTop + $(window).height();
</span><span class="cx">          sidebarBounds = sidebar.offset();
</span><del>-               
</del><ins>+
</ins><span class="cx">           sidebarBounds.bottom = sidebarBounds.top + sidebar.outerHeight();
</span><span class="cx"> 
</span><span class="cx">          if ( viewportTop > sidebarBounds.bottom || viewportBottom < sidebarBounds.top ) {
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/themes.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/themes.php    2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/themes.php       2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">  <# } #>
</span><span class="cx">  <span class="more-details"><?php _e( 'Theme Details' ); ?></span>
</span><span class="cx">  <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
</span><del>-       
</del><ins>+
</ins><span class="cx">   <# if ( data.active ) { #>
</span><span class="cx">          <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
</span><span class="cx">  <# } else { #>
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/update-core.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/update-core.php       2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-admin/update-core.php  2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> if ( 'upgrade-core' == $action ) {
</span><span class="cx">  // Force a update check when requested
</span><span class="cx">  $force_check = ! empty( $_GET['force-check'] );
</span><del>-       wp_version_check( array(), $force_check ); 
</del><ins>+        wp_version_check( array(), $force_check );
</ins><span class="cx"> 
</span><span class="cx">  require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">  ?>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-image-editor-gd.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-image-editor-gd.php       2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php  2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">                          return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
</span><span class="cx">          }
</span><span class="cx">          elseif ( 'image/jpeg' == $mime_type ) {
</span><del>-                       if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) ) 
</del><ins>+                        if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) )
</ins><span class="cx">                           return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
</span><span class="cx">          }
</span><span class="cx">          else {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-image-editor-imagick.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-image-editor-imagick.php  2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-includes/class-wp-image-editor-imagick.php     2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">          if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
</span><span class="cx">                  return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
</span><span class="cx"> 
</span><del>-               /** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */ 
</del><ins>+                /** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
</ins><span class="cx">           // Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
</span><span class="cx">          @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
</span><span class="cx"> 
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx">          $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
</span><span class="cx">          @ chmod( $filename, $perms );
</span><span class="cx"> 
</span><del>-               /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */ 
</del><ins>+                /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
</ins><span class="cx">           return array(
</span><span class="cx">                  'path'      => $filename,
</span><span class="cx">                  'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php     2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-includes/formatting.php        2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -1867,7 +1867,7 @@
</span><span class="cx">   * @param string $smiley_url URL for the smiley image.
</span><span class="cx">   * @param string $img        Filename for the smiley image.
</span><span class="cx">   * @param string $site_url   Site URL, as returned by site_url().
</span><del>-        */     
</del><ins>+         */
</ins><span class="cx">   $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
</span><span class="cx"> 
</span><span class="cx">  return sprintf( ' <img src="%s" alt="%s" class="wp-smiley" /> ', esc_url( $src_url ), esc_attr( $smiley ) );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php      2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-includes/functions.php 2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -2250,7 +2250,7 @@
</span><span class="cx">                  -webkit-box-sizing: border-box;
</span><span class="cx">                  -moz-box-sizing:    border-box;
</span><span class="cx">                  box-sizing:         border-box;
</span><del>-               
</del><ins>+
</ins><span class="cx">                   -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08);
</span><span class="cx">                  box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08);
</span><span class="cx">                  vertical-align: top;
</span></span></pre></div>
<a id="trunksrcwpincludeswlwmanifestxml"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/wlwmanifest.xml (26850 => 26851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/wlwmanifest.xml    2013-12-11 17:55:39 UTC (rev 26850)
+++ trunk/src/wp-includes/wlwmanifest.xml       2013-12-11 19:48:29 UTC (rev 26851)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">  <supportsKeywords>Yes</supportsKeywords>
</span><span class="cx">  <supportsGetTags>Yes</supportsGetTags>
</span><span class="cx">   </options>
</span><del>-  
</del><ins>+
</ins><span class="cx">   <weblog>
</span><span class="cx">     <serviceName>WordPress</serviceName>
</span><span class="cx">     <imageUrl>images/wlw/wp-icon.png</imageUrl>
</span><span class="lines">@@ -15,13 +15,13 @@
</span><span class="cx">     <homepageLinkText>View site</homepageLinkText>
</span><span class="cx">     <adminLinkText>Dashboard</adminLinkText>
</span><span class="cx">     <adminUrl>
</span><del>-      <![CDATA[ 
-                       {blog-postapi-url}/../wp-admin/ 
</del><ins>+      <![CDATA[
+                       {blog-postapi-url}/../wp-admin/
</ins><span class="cx">           ]]>
</span><span class="cx">     </adminUrl>
</span><span class="cx">     <postEditingUrl>
</span><del>-      <![CDATA[ 
-                       {blog-postapi-url}/../wp-admin/post.php?action=edit&post={post-id} 
</del><ins>+      <![CDATA[
+                       {blog-postapi-url}/../wp-admin/post.php?action=edit&post={post-id}
</ins><span class="cx">           ]]>
</span><span class="cx">     </postEditingUrl>
</span><span class="cx">   </weblog>
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">       <text>Manage Comments</text>
</span><span class="cx">       <imageUrl>images/wlw/wp-comments.png</imageUrl>
</span><span class="cx">       <clickUrl>
</span><del>-        <![CDATA[ 
</del><ins>+        <![CDATA[
</ins><span class="cx">                           {blog-postapi-url}/../wp-admin/edit-comments.php
</span><span class="cx">                  ]]>
</span><span class="cx">       </clickUrl>
</span></span></pre>
</div>
</div>

</body>
</html>