Changeset 38205 for trunk

Timestamp:

08/05/2016 07:27:56 PM (10 years ago)

Author:

ocean90

Message:

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.

Props azaozz for review.
Fixes #37583.

Location:

trunk

Files:

• src/wp-admin/includes/update.php (modified) (1 diff)
• src/wp-admin/js/updates.js (modified) (2 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/qunit/fixtures/updates.js (modified) (1 diff)

trunk/src/wp-admin/includes/update.php

@@ -632 +632 @@
         ?>
         <script id="tmpl-wp-updates-admin-notice" type="text/html">
-                <div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{{ data.message }}}</p></div>
+                <div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{ data.message }}</p></div>
         </script>
         <script id="tmpl-wp-bulk-updates-admin-notice" type="text/html">

trunk/src/wp-admin/js/updates.js

@@ -1563 +1563 @@
                 }
 
-                if ( _.isString( response ) ) {
+                if ( _.isString( response ) && '-1' === response ) {
+                        error = wp.updates.l10n.nonceError;
+                } else if ( _.isString( response ) ) {
                         error = response;
+                } else if ( 'undefined' !== typeof response.readyState && 0 === response.readyState ) {
+                        error = wp.updates.l10n.connectionError;
                 } else if ( _.isString( response.responseText ) && '' !== response.responseText ) {
                         error = response.responseText;
@@ -1585 +1589 @@
                 }
 
+                // Messages are escaped, remove HTML tags to make them more readable.
+                error = error.replace( /<[\/a-z][^<>]*>/gi, '' );
                 errorMessage = errorMessage.replace( '%s', error );
 

trunk/src/wp-includes/script-loader.php

@@ -678 +678 @@
                                 'activateImporterLabel'      => __( 'Run %s' ),
                                 'unknownError'               => __( 'An unknown error occurred' ),
+                                'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
+                                'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
                                 'pluginsFound'               => __( 'Number of plugins found: %d' ),
                                 'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),

trunk/tests/qunit/fixtures/updates.js

@@ -47 +47 @@
                 'activateImporter': 'Run Importer',
                 'unknownError': 'An unknown error occurred',
+                'connectionError': 'Connection lost or the server is busy. Please try again later.',
+                'nonceError': 'An error has occurred. Please reload the page and try again.',
                 'pluginsFound': 'Number of plugins found: %d',
                 'noPluginsFound': 'No plugins found. Try a different search.'