<!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>[38206] branches/4.6: Update/Install: Replace "error" and "-1" failure messages with a more meaningful one.</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/38206">38206</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/38206","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-05 19:29:31 +0000 (Fri, 05 Aug 2016)</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'>Update/Install: Replace "error" and "-1" failure messages with a more meaningful one.
* "-1" is an invalid nonce error, show 'An error has occurred. Please reload the page and try again.'.
* "error" means that the connection to the server was lost, show 'Connection lost or the server is busy. Please try again later.'.
* Escape the message in `wp-updates-admin-notice` because the response may include HTML.
* Remove HTML tags in `wp.updates.isValidResponse()` to make PHP's error messages more readable.
Merge of <a href="https://core.trac.wordpress.org/changeset/38205">[38205]</a> to the 4.6 branch.
Props azaozz for review.
See <a href="https://core.trac.wordpress.org/ticket/37583">#37583</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches46srcwpadminincludesupdatephp">branches/4.6/src/wp-admin/includes/update.php</a></li>
<li><a href="#branches46srcwpadminjsupdatesjs">branches/4.6/src/wp-admin/js/updates.js</a></li>
<li><a href="#branches46srcwpincludesscriptloaderphp">branches/4.6/src/wp-includes/script-loader.php</a></li>
<li><a href="#branches46testsqunitfixturesupdatesjs">branches/4.6/tests/qunit/fixtures/updates.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches46">branches/4.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.6 2016-08-05 19:27:56 UTC (rev 38205)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.6 2016-08-05 19:29:31 UTC (rev 38206)
</ins><a id="branches46"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,38181,38183,38185-38186,38189,38191,38194,38196,38199,38201
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,38181,38183,38185-38186,38189,38191,38194,38196,38199,38201,38205
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches46srcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-admin/includes/update.php 2016-08-05 19:27:56 UTC (rev 38205)
+++ branches/4.6/src/wp-admin/includes/update.php 2016-08-05 19:29:31 UTC (rev 38206)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,7 +631,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_print_admin_notice_templates() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script id="tmpl-wp-updates-admin-notice" type="text/html">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{{ data.message }}}</p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{ data.message }}</p></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script id="tmpl-wp-bulk-updates-admin-notice" type="text/html">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errors ) { #>notice-error<# } else { #>notice-success<# } #>">
</span></span></pre></div>
<a id="branches46srcwpadminjsupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-admin/js/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-admin/js/updates.js 2016-08-05 19:27:56 UTC (rev 38205)
+++ branches/4.6/src/wp-admin/js/updates.js 2016-08-05 19:29:31 UTC (rev 38206)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1562,8 +1562,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- if ( _.isString( response ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( _.isString( response ) && '-1' === response ) {
+ error = wp.updates.l10n.nonceError;
+ } else if ( _.isString( response ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> error = response;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( 'undefined' !== typeof response.readyState && 0 === response.readyState ) {
+ error = wp.updates.l10n.connectionError;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( _.isString( response.responseText ) && '' !== response.responseText ) {
</span><span class="cx" style="display: block; padding: 0 10px"> error = response.responseText;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( _.isString( response.statusText ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1584,6 +1588,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><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">+ // Messages are escaped, remove HTML tags to make them more readable.
+ error = error.replace( /<[\/a-z][^<>]*>/gi, '' );
</ins><span class="cx" style="display: block; padding: 0 10px"> errorMessage = errorMessage.replace( '%s', error );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add admin notice.
</span></span></pre></div>
<a id="branches46srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/script-loader.php 2016-08-05 19:27:56 UTC (rev 38205)
+++ branches/4.6/src/wp-includes/script-loader.php 2016-08-05 19:29:31 UTC (rev 38206)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,6 +677,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Importer name */
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateImporterLabel' => __( 'Run %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'unknownError' => __( 'An unknown error occurred' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'connectionError' => __( 'Connection lost or the server is busy. Please try again later.' ),
+ 'nonceError' => __( 'An error has occurred. Please reload the page and try again.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginsFound' => __( 'Number of plugins found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPluginsFound' => __( 'No plugins found. Try a different search.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="branches46testsqunitfixturesupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/tests/qunit/fixtures/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/tests/qunit/fixtures/updates.js 2016-08-05 19:27:56 UTC (rev 38205)
+++ branches/4.6/tests/qunit/fixtures/updates.js 2016-08-05 19:29:31 UTC (rev 38206)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateThemeLabel': 'Activate %s',
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateImporter': 'Run Importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'unknownError': 'An unknown error occurred',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'connectionError': 'Connection lost or the server is busy. Please try again later.',
+ 'nonceError': 'An error has occurred. Please reload the page and try again.',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginsFound': 'Number of plugins found: %d',
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPluginsFound': 'No plugins found. Try a different search.'
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>