<!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>[21717] branches/3.4: Merge [21205] and [21688] to the 3.4 branch.</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, #logmsg > ol { margin-left: 0; 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/21717">21717</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-04 03:17:11 +0000 (Tue, 04 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://core.trac.wordpress.org/changeset/21205">[21205]</a> and <a href="http://core.trac.wordpress.org/changeset/21688">[21688]</a> to the 3.4 branch. props SergeyBiryukov, yoavf. fixes <a href="http://core.trac.wordpress.org/ticket/21590">#21590</a>. see <a href="http://core.trac.wordpress.org/ticket/21106">#21106</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches34wpadminincludesmetaboxesphp">branches/3.4/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#branches34wpadminjslinkdevjs">branches/3.4/wp-admin/js/link.dev.js</a></li>
<li><a href="#branches34wpincludesjswplistsdevjs">branches/3.4/wp-includes/js/wp-lists.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches34wpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/includes/meta-boxes.php (21716 => 21717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/includes/meta-boxes.php 2012-09-04 02:46:01 UTC (rev 21716)
+++ branches/3.4/wp-admin/includes/meta-boxes.php 2012-09-04 03:17:11 UTC (rev 21717)
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> <p id="link-category-add" class="wp-hidden-child">
</span><span class="cx"> <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
</span><span class="cx"> <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
</span><del>- <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
</del><ins>+ <input type="button" id="link-category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
</ins><span class="cx"> <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
</span><span class="cx"> <span id="category-ajax-response"></span>
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="branches34wpadminjslinkdevjs"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/js/link.dev.js (21716 => 21717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/js/link.dev.js 2012-09-04 02:46:01 UTC (rev 21716)
+++ branches/3.4/wp-admin/js/link.dev.js 2012-09-04 03:17:11 UTC (rev 21717)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> // Ajax Cat
</span><span class="cx"> newCat = $('#newcat').one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
</span><del>- $('#category-add-submit').click( function() { newCat.focus(); } );
</del><ins>+ $('#link-category-add-submit').click( function() { newCat.focus(); } );
</ins><span class="cx"> syncChecks = function() {
</span><span class="cx"> if ( noSyncChecks )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branches34wpincludesjswplistsdevjs"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-includes/js/wp-lists.dev.js (21716 => 21717)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-includes/js/wp-lists.dev.js 2012-09-04 02:46:01 UTC (rev 21716)
+++ branches/3.4/wp-includes/js/wp-lists.dev.js 2012-09-04 03:17:11 UTC (rev 21717)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if ( !s )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !e.is('[class^="add:' + list.id + ':"]') )
</del><ins>+ if ( !e.is('[id="' + s.what + '-add-submit"]') )
</ins><span class="cx"> return !wpList.add.call( list, e, s );
</span><span class="cx">
</span><span class="cx"> if ( !s.element )
</span></span></pre>
</div>
</div>
</body>
</html>