<!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>[24303] trunk: 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/24303">24303</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2013-05-20 12:10:58 +0000 (Mon, 20 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincssiertlcss">trunk/wp-admin/css/ie-rtl.css</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminjspostjs">trunk/wp-admin/js/post.js</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincssiertlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie-rtl.css (24302 => 24303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie-rtl.css 2013-05-20 12:08:07 UTC (rev 24302)
+++ trunk/wp-admin/css/ie-rtl.css 2013-05-20 12:10:58 UTC (rev 24303)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.screen-reader-text {
</del><ins>+.screen-reader-text {
</ins><span class="cx"> right: auto;
</span><del>- text-indent: -1000em;
-}
</del><span class="cx">\ No newline at end of file
</span><ins>+ text-indent: -1000em;
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (24302 => 24303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2013-05-20 12:08:07 UTC (rev 24302)
+++ trunk/wp-admin/includes/misc.php 2013-05-20 12:10:58 UTC (rev 24303)
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> $error = array(
</span><span class="cx"> 'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $avatar = get_avatar( $user->ID, 64 ) ) {
</span><span class="cx"> if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
</span><span class="cx"> $error['avatar_src'] = $matches[1];
</span></span></pre></div>
<a id="trunkwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post.js (24302 => 24303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post.js 2013-05-20 12:08:07 UTC (rev 24302)
+++ trunk/wp-admin/js/post.js 2013-05-20 12:10:58 UTC (rev 24303)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> timeout = window.setTimeout( function(){ check = 1; }, 3600000 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $(document).on( 'heartbeat-send.wp-refresh-nonces', function( e, data ) {
</del><ins>+ $(document).on( 'heartbeat-send.wp-refresh-nonces', function( e, data ) {
</ins><span class="cx"> var nonce, post_id;
</span><span class="cx">
</span><span class="cx"> if ( check ) {
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (24302 => 24303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2013-05-20 12:08:07 UTC (rev 24302)
+++ trunk/wp-includes/class-http.php 2013-05-20 12:10:58 UTC (rev 24303)
</span><span class="lines">@@ -762,12 +762,12 @@
</span><span class="cx"> $process['body'] = '';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $r['limit-response-size'] ) && ( $bytes_written + strlen( $block ) ) > $r['limit-response-size'] )
</span><span class="cx"> $block = substr( $block, 0, ( $r['limit-response-size'] - $bytes_written ) );
</span><span class="cx">
</span><del>- $bytes_written += fwrite( $stream_handle, $block );
-
</del><ins>+ $bytes_written += fwrite( $stream_handle, $block );
+
</ins><span class="cx"> $keep_reading = !isset( $r['limit-response-size'] ) || $bytes_written < $r['limit-response-size'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1847,7 +1847,7 @@
</span><span class="cx">
</span><span class="cx"> if ( function_exists( 'gzuncompress' ) )
</span><span class="cx"> $type[] = 'compress;q=0.5';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( function_exists( 'gzdecode' ) )
</span><span class="cx"> $type[] = 'gzip;q=0.5';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (24302 => 24303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2013-05-20 12:08:07 UTC (rev 24302)
+++ trunk/wp-includes/taxonomy.php 2013-05-20 12:10:58 UTC (rev 24303)
</span><span class="lines">@@ -2216,12 +2216,12 @@
</span><span class="cx">
</span><span class="cx"> if ( ! $append ) {
</span><span class="cx"> $delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $delete_tt_ids ) {
</span><span class="cx"> $in_delete_tt_ids = "'" . implode( "', '", $delete_tt_ids ) . "'";
</span><span class="cx"> $delete_term_ids = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
</span><span class="cx"> $delete_term_ids = array_map( 'intval', $delete_term_ids );
</span><del>-
</del><ins>+
</ins><span class="cx"> $remove = wp_remove_object_terms( $object_id, $delete_term_ids, $taxonomy );
</span><span class="cx"> if ( is_wp_error( $remove ) ) {
</span><span class="cx"> return $remove;
</span><span class="lines">@@ -2295,33 +2295,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tt_ids = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( (array) $terms as $term ) {
</span><span class="cx"> if ( ! strlen( trim( $term ) ) ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
</span><span class="cx"> // Skip if a non-existent term ID is passed.
</span><span class="cx"> if ( is_int( $term ) ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_wp_error( $term_info ) ) {
</span><span class="cx"> return $term_info;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $tt_ids[] = $term_info['term_taxonomy_id'];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $tt_ids ) {
</span><span class="cx"> $in_tt_ids = "'" . implode( "', '", $tt_ids ) . "'";
</span><span class="cx"> do_action( 'delete_term_relationships', $object_id, $tt_ids );
</span><span class="cx"> $deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
</span><span class="cx"> do_action( 'deleted_term_relationships', $object_id, $tt_ids );
</span><span class="cx"> wp_update_term_count( $tt_ids, $taxonomy );
</span><del>-
</del><ins>+
</ins><span class="cx"> return (bool) $deleted;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>