<!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>[29707] trunk/src: Pinking shears.</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/29707">29707</a></dd>

<dt>Author</dt> <dd>nacin</dd>

<dt>Date</dt> <dd>2014-09-04 15:22:58 +0000 (Thu, 04 Sep 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Pinking shears.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>

<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>

<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>

<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php     2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php        2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -23,14 +23,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          global $post_id;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpimporterphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-importer.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-importer.php        2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-importer.php   2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -196,7 +196,7 @@

</span><span class="cx">  /**

</span><span class="cx">   * Bump up the request timeout for http requests

</span><span class="cx">   *

</span><del>-        * @param int $val 

</del><ins>+         * @param int $val

</ins><span class="cx">    * @return int

</span><span class="cx">   */

</span><span class="cx">  public function bump_request_timeout( $val ) {

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-links-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-links-list-table.php        2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php   2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -11,14 +11,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          parent::__construct( array(

</span><span class="cx">                  'plural' => 'bookmarks',

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswplisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-list-table.php      2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -89,7 +89,7 @@

<span class="cx">   *                            screen. If left null, the current screen will be automatically set.

<span class="cx">   *                            Default null.

</span><span class="cx">   * }

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          $args = wp_parse_args( $args, array(

</span><span class="cx">                  'plural' => '',

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php     2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php        2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -11,14 +11,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          parent::__construct( array(

</span><span class="cx">                  'plural' => 'sites',

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php      2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -11,14 +11,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          global $status, $page;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php        2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php   2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -47,7 +47,7 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php        2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php   2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -13,14 +13,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          global $post_type, $taxonomy, $action, $tax;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php       2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php  2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -14,14 +14,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          parent::__construct( array(

</span><span class="cx">                  'ajax' => true,

</span></span></pre></div>

<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php        2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php   2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -30,14 +30,14 @@

</span><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Constructor.

</span><del>-        * 

</del><ins>+         *

</ins><span class="cx">    * @since 3.1.0

</span><span class="cx">   * @access public

</span><span class="cx">   *

<span class="cx">   * @see WP_List_Table::__construct() for more information on default arguments.

</span><span class="cx">   *

<span class="cx">   * @param array $args An associative array of arguments.

</span><del>-        */     

</del><ins>+         */

</ins><span class="cx">   public function __construct( $args = array() ) {

</span><span class="cx">          parent::__construct( array(

</span><span class="cx">                  'singular' => 'user',

</span></span></pre></div>

<a id="trunksrcwpadminincludesmiscphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/misc.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/misc.php     2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/includes/misc.php        2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -832,7 +832,7 @@

</span><span class="cx">  * as they disregard the autocomplete setting on the editor textarea. That can break the editor

</span><span class="cx">  * when the user navigates to it with the browser's Back button. See #28037

</span><span class="cx">  *

</span><del>- * @since 4.0 

</del><ins>+ * @since 4.0

</ins><span class="cx">  */

</span><span class="cx"> function post_form_autocomplete_off() {

</span><span class="cx">  global $is_safari, $is_chrome;

</span></span></pre></div>

<a id="trunksrcwpadminusersphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/users.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/users.php     2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-admin/users.php        2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -248,7 +248,7 @@

</span><span class="cx">  /**

<span class="cx">   * Fires at the end of the delete users form prior to the confirm button.

</span><span class="cx">   *

</span><del>-        * @since 4.0.0 

</del><ins>+         * @since 4.0.0

</ins><span class="cx">    *

<span class="cx">   * @param WP_User $current_user WP_User object for the user being deleted.

</span><span class="cx">   */

</span></span></pre></div>

<a id="trunksrcwpincludesclasswpembedphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-embed.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/class-wp-embed.php 2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-includes/class-wp-embed.php    2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -15,7 +15,7 @@

</span><span class="cx">  /**

</span><span class="cx">   * When an URL cannot be embedded, return false instead of returning a link

<span class="cx">   * or the URL. Bypasses the 'embed_maybe_make_link' filter.

</span><del>-        */                     

</del><ins>+         */

</ins><span class="cx">   public $return_false_on_fail = false;

</span><span class="cx"> 

</span><span class="cx">  /**

</span></span></pre></div>

<a id="trunksrcwpincludesformattingphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (29706 => 29707)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/formatting.php     2014-09-04 15:04:02 UTC (rev 29706)

+++ trunk/src/wp-includes/formatting.php        2014-09-04 15:22:58 UTC (rev 29707)

</span><span class="lines">@@ -147,7 +147,7 @@

</span><span class="cx">          $dynamic_characters['apos'] = array_keys( $dynamic );

</span><span class="cx">          $dynamic_replacements['apos'] = array_values( $dynamic );

</span><span class="cx">          $dynamic = array();

</span><del>-               

</del><ins>+

</ins><span class="cx">           // Quoted Numbers like "42"

</span><span class="cx">          if ( '"' !== $opening_quote && '"' !== $closing_quote ) {

</span><span class="cx">                  $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;

</span><span class="lines">@@ -167,11 +167,11 @@

</span><span class="cx">          if ( '"' !== $closing_quote ) {

</span><span class="cx">                  $dynamic[ '/"/' ] = $closing_quote;

</span><span class="cx">          }

</span><del>-               

</del><ins>+

</ins><span class="cx">           $dynamic_characters['quote'] = array_keys( $dynamic );

</span><span class="cx">          $dynamic_replacements['quote'] = array_values( $dynamic );

</span><span class="cx">          $dynamic = array();

</span><del>-               

</del><ins>+

</ins><span class="cx">           // Dashes and spaces

</span><span class="cx">          $dynamic[ '/---/' ] = $em_dash;

</span><span class="cx">          $dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;

</span></span></pre>

</div>

</div>

</body>

</html>