Changeset 28126 for trunk/src/wp-admin/theme-install.php

Timestamp:

04/15/2014 01:15:43 AM (12 years ago)

Author:

nacin

Message:

Theme Installer: Revert to proxying through PHP for WordPress.org API requests.

This is to ensure we have valid installation nonces, though we've run into this as a problem previously (see #27639, #27581, #27055).

A tad slower, but we gained speed in 3.9 by simplifying the request made to the API.

props ocean90.
fixes #27798.

File:

• trunk/src/wp-admin/theme-install.php (modified) (5 diffs)

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

@@ -47 +47 @@
         'canInstall'    => current_user_can( 'install_themes' ),
         'installURI'    => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-        'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH ),
-        'updateURI'     => self_admin_url( 'update.php' ),
-        '_nonceInstall' => wp_create_nonce( 'install-theme' )
+        'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH )
     ),
     'l10n' => array(
@@ -57 +55 @@
         'upload' => __( 'Upload Theme' ),
         'back'   => __( 'Back' ),
-        '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/' ) )
+        'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' )
     ),
     'installedThemes' => array_keys( $installed_themes ),
@@ -200 +198 @@
 
     <div class="theme-actions">
-        <a class="button button-primary" href="{{ data.installURI }}"><?php esc_html_e( 'Install' ); ?></a>
+        <a class="button button-primary" href="{{ data.install_url }}"><?php esc_html_e( 'Install' ); ?></a>
         <a class="button button-secondary preview install-theme-preview" href="#"><?php esc_html_e( 'Preview' ); ?></a>
     </div>
@@ -216 +214 @@
             <a href="#" class="button button-primary theme-install disabled"><?php _e( 'Installed' ); ?></a>
         <# } else { #>
-            <a href="{{ data.installURI }}" class="button button-primary theme-install"><?php _e( 'Install' ); ?></a>
+            <a href="{{ data.install_url }}" class="button button-primary theme-install"><?php _e( 'Install' ); ?></a>
         <# } #>
         </div>
@@ -234 +232 @@
                         <span class="five"></span>
                     <# if ( data.num_ratings ) { #>
-                        <p class="ratings">({{ data.num_ratings }})</p>
+                        <p class="ratings">{{ data.num_ratings }}</p>
                     <# } else { #>
                         <p class="ratings"><?php _e( 'No ratings.' ); ?></p>