Changeset 38206 for branches/4.6/src/wp-includes/script-loader.php

Timestamp:

08/05/2016 07:29:31 PM (8 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.

Merge of [38205] to the 4.6 branch.

Props azaozz for review.
See #37583.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (1 diff)

branches/4.6/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.' ),