Changeset 28105

Timestamp:

04/13/2014 07:01:21 PM (11 years ago)

Author:

nacin

Message:

Theme install: Set a timeout and error message for API responses.

props ocean90.
fixes #27708.

Location:

trunk/src/wp-admin

Files:

• js/theme.js (modified) (1 diff)
• theme-install.php (modified) (1 diff)

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

@@ -326 +326 @@
             url: 'https://api.wordpress.org/themes/info/1.1/?callback=?',
             dataType: 'jsonp',
+            timeout: 15000, // 15 seconds
 
             // Request data

trunk/src/wp-admin/theme-install.php

@@ -57 +57 @@
         'upload' => __( 'Upload Theme' ),
         'back'   => __( 'Back' ),
-        'error'  => ( 'There was a problem trying to load the themes. Please, try again.' ), // @todo improve
+        'error'  => sprintf( __( 'An unexpected error occurred and we can&#8127;t reach WordPress.org. If you continue to have problems, please try the <a href="%s">support forums</a>.' ), __( 'https://wordpress.org/support/' ) )
     ),
     'installedThemes' => array_keys( $installed_themes ),