<!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>[41684] trunk: Quick/Bulk Edit: Improve the inline error messages styling.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41684">41684</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41684","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-02 21:51:09 +0000 (Mon, 02 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Quick/Bulk Edit: Improve the inline error messages styling.
- uses the core `notice` styles for the Quick Edit form inline error messages
- adds missing periods at the end of a few error messages
Props ocean90, karmatosed, melchoyce, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/35496">#35496</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssiecss">trunk/src/wp-admin/css/ie.css</a></li>
<li><a href="#trunksrcwpadmincsslisttablescss">trunk/src/wp-admin/css/list-tables.css</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="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</a></li>
<li><a href="#trunksrcwpadminjsinlineeditpostjs">trunk/src/wp-admin/js/inline-edit-post.js</a></li>
<li><a href="#trunksrcwpadminjsinlineedittaxjs">trunk/src/wp-admin/js/inline-edit-tax.js</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpdeleteTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssiecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/ie.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/ie.css 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/css/ie.css 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 29%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.inline-edit-row p.submit {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.inline-edit-row .submit {
</ins><span class="cx" style="display: block; padding: 0 10px"> zoom: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmincsslisttablescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/list-tables.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/list-tables.css 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/css/list-tables.css 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,19 +150,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 5px 7px 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-align: center;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #replysubmit .button {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 5px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#replysubmit .error {
- color: red;
- line-height: 21px;
- text-align: center;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #replyrow.inline-edit-row fieldset.comment-reply {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: inherit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,18 +950,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 2.5;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.inline-edit-row p.submit {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.inline-edit-row .submit {
</ins><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0.5em;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0.5em 0 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.inline-edit-row span.error {
- line-height: 22px;
- margin: 0 15px;
- padding: 3px 5px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.inline-edit-row .notice-error {
+ margin-top: 1em;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.inline-edit-row .notice-error .error {
+ margin: 0.5em 0;
+ padding: 2px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Positioning */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Needs higher specificity for the padding */
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1737,7 +1737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="submit inline-edit-save">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="submit inline-edit-save">
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! $bulk ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1752,9 +1752,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="error" style="display:none"></span>
</del><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="notice notice-error notice-alt inline hidden">
+ <p class="error"></p>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td></tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk++;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,16 +616,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="inline-edit-save submit">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="inline-edit-save submit">
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="error" style="display:none;"></span>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="notice notice-error notice-alt inline hidden">
+ <p class="error"></p>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td></tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody></table></form>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/includes/template.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,15 +423,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p id="replysubmit" class="submit">
- <a href="#comments-form" class="save button button-primary alignright">
- <span id="addbtn" style="display:none;"><?php _e('Add Comment'); ?></span>
- <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
- <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
- <a href="#comments-form" class="cancel button alignleft"><?php _e('Cancel'); ?></a>
- <span class="waiting spinner"></span>
- <span class="error" style="display:none;"></span>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="replysubmit" class="submit">
+ <p>
+ <a href="#comments-form" class="save button button-primary alignright">
+ <span id="addbtn" style="display: none;"><?php _e( 'Add Comment' ); ?></span>
+ <span id="savebtn" style="display: none;"><?php _e( 'Update Comment' ); ?></span>
+ <span id="replybtn" style="display: none;"><?php _e( 'Submit Reply' ); ?></span>
+ </a>
+ <a href="#comments-form" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></a>
+ <span class="waiting spinner"></span>
+ </p>
+ <br class="clear" />
+ <div class="notice notice-error notice-alt inline hidden">
+ <p class="error"></p>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" id="action" value="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="comment_ID" id="comment_ID" value="" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -892,7 +898,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array|WP_Screen $screen Optional. The screen or screens on which to show the box
</span><span class="cx" style="display: block; padding: 0 10px"> * (such as a post type, 'link', or 'comment'). Accepts a single
</span><span class="cx" style="display: block; padding: 0 10px"> * screen ID, WP_Screen object, or array of screen IDs. Default
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * is the current screen. If you have used add_menu_page() or
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * is the current screen. If you have used add_menu_page() or
</ins><span class="cx" style="display: block; padding: 0 10px"> * add_submenu_page() to create a new screen (and hence screen_id),
</span><span class="cx" style="display: block; padding: 0 10px"> * make sure your menu slug conforms to the limits of sanitize_key()
</span><span class="cx" style="display: block; padding: 0 10px"> * otherwise the 'screen' menu may not correctly render on your page.
</span></span></pre></div>
<a id="trunksrcwpadminjseditcommentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/edit-comments.js 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/js/edit-comments.js 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $('#com-reply').append( replyrow );
</span><span class="cx" style="display: block; padding: 0 10px"> $('#replycontent').css('height', '').val('');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edithead input').val('');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.error', replyrow).empty().hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.notice-error', replyrow )
+ .addClass( 'hidden' )
+ .find( '.error' ).empty();
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.spinner', replyrow ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.cid = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,9 +756,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> send : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var post = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var post = {},
+ $errorNotice = $( '#replysubmit .error-notice' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#replysubmit .error').hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errorNotice.addClass( 'hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#replysubmit .spinner' ).addClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('#replyrow input').not(':button').each(function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -847,16 +850,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> error : function(r) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var er = r.statusText;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var er = r.statusText,
+ $errorNotice = $( '#replysubmit .notice-error' ),
+ $error = $errorNotice.find( '.error' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#replysubmit .spinner' ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( r.responseText )
</span><span class="cx" style="display: block; padding: 0 10px"> er = r.responseText.replace( /<.[^<>]*?>/g, '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( er )
- $('#replysubmit .error').html(er).show();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( er ) {
+ $errorNotice.removeClass( 'hidden' );
+ $error.html( er );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> addcomment: function(post_id) {
</span></span></pre></div>
<a id="trunksrcwpadminjsinlineeditpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/inline-edit-post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/inline-edit-post.js 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/js/inline-edit-post.js 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +413,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make ajax request.
</span><span class="cx" style="display: block; padding: 0 10px"> $.post( ajaxurl, params,
</span><span class="cx" style="display: block; padding: 0 10px"> function(r) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $errorSpan = $( '#edit-' + id + ' .inline-edit-save .error' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $errorNotice = $( '#edit-' + id + ' .inline-edit-save .notice-error' ),
+ $error = $errorNotice.find( '.error' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'table.widefat .spinner' ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.ac_results' ).hide();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,11 +430,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> r = r.replace( /<.[^<>]*?>/g, '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errorSpan.html( r ).show();
- wp.a11y.speak( $errorSpan.text() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errorNotice.removeClass( 'hidden' );
+ $error.html( r );
+ wp.a11y.speak( $error.text() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errorSpan.html( inlineEditL10n.error ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errorNotice.removeClass( 'hidden' );
+ $error.html( inlineEditL10n.error );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( inlineEditL10n.error );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="trunksrcwpadminjsinlineedittaxjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/inline-edit-tax.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/inline-edit-tax.js 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-admin/js/inline-edit-tax.js 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +196,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function(r) {
</span><span class="cx" style="display: block; padding: 0 10px"> var row, new_id, option_value,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errorSpan = $( '#edit-' + id + ' .inline-edit-save .error' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errorNotice = $( '#edit-' + id + ' .inline-edit-save .notice-error' ),
+ $error = $errorNotice.find( '.error' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'table.widefat .spinner' ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,15 +226,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errorSpan.html( r ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errorNotice.removeClass( 'hidden' );
+ $error.html( r );
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Some error strings may contain HTML entities (e.g. `“`), let's use
</span><span class="cx" style="display: block; padding: 0 10px"> * the HTML element's text.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.a11y.speak( $errorSpan.text() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.a11y.speak( $error.text() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errorSpan.html( inlineEditL10n.error ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errorNotice.removeClass( 'hidden' );
+ $error.html( inlineEditL10n.error );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( inlineEditL10n.error );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/src/wp-includes/taxonomy.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do not allow unregistering internal taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $taxonomy_object->_builtin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,7 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $term ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $taxonomy && ! taxonomy_exists( $taxonomy ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2123,7 +2123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = apply_filters( 'wp_insert_term_data', $data, $taxonomy, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $wpdb->insert( $wpdb->terms, $data ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database' ), $wpdb->last_error );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database.' ), $wpdb->last_error );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = (int) $wpdb->insert_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2347,7 +2347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $values )
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database.' ), $wpdb->last_error );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $object_id, $taxonomy . '_relationships' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2615,7 +2615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = (array) $term->data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2701,7 +2701,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = wp_unique_term_slug($slug, (object) $args);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Taxonomy term slug */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error('duplicate_term_slug', sprintf(__('The slug “%s” is already in use by another term'), $slug));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'duplicate_term_slug', sprintf( __( 'The slug “%s” is already in use by another term.' ), $slug ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3916,7 +3916,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_object($term) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = new WP_Error('invalid_term', __('Empty Term'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $term ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $term;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4128,7 +4128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$object_id = (int) $object_id )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'invalid_object', __( 'Invalid object ID.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object_terms = get_object_term_cache( $object_id, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $object_terms ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpdeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'editor', 'editor', 'category', '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 500, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __('Empty Term'), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __('Empty Term.'), $result->message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_invalid_term() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', '', array( 'taxonomy' => 'category' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 500, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __('Empty Term'), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __('Empty Term.'), $result->message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty_term_name() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', self::$child_term, array( 'taxonomy' => 'category', 'slug' => $parent_term->slug ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 500, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( htmlspecialchars( sprintf( __('The slug “%s” is already in use by another term'), $parent_term->slug ) ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( htmlspecialchars( sprintf( __('The slug “%s” is already in use by another term.'), $parent_term->slug ) ), $result->message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_edit_all_fields() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2017-10-02 19:43:02 UTC (rev 41683)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2017-10-02 21:51:09 UTC (rev 41684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'editor', 'editor', 'category', '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 500, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __('Empty Term'), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __('Empty Term.'), $result->message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_invalid_term() {
</span></span></pre>
</div>
</div>
</body>
</html>