Ticket #9508: 9508.diff

wp-admin/includes/theme-install.php

@@ -97 +97 @@
  * @param string $page
  */
 function install_theme_search($page) {
+        global $theme_field_defaults;
+
         $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
         $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
 
@@ -467 +469 @@
                 exit;
         }
 
-        if ( version_compare($GLOBALS['wp_version'], $api->tested, '>') )
+        if ( !empty($api->tested) && version_compare($GLOBALS['wp_version'], $api->tested, '>') )
                 echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This theme has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
-        else if ( version_compare($GLOBALS['wp_version'], $api->requires, '<') )
+        else if ( !empty($api->requires) && version_compare($GLOBALS['wp_version'], $api->requires, '<') )
                 echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This theme has not been marked as <strong>compatible</strong> with your version of WordPress.') . '</p></div>';
 
         // Default to a "new" theme
@@ -477 +479 @@
         // Check to see if this theme is known to be installed, and has an update awaiting it.
         $update_themes = get_transient('update_themes');
         if ( is_object($update_themes) ) {
-                foreach ( (array)$update_themes->response as $file => $theme ) {
-                        if ( $theme->slug === $api->slug ) {
+                foreach ( (array)$update_themes->response as $theme_slug => $theme_info ) {
+                        if ( $theme_slug === $api->slug ) {
                                 $type = 'update_available';
-                                $update_file = $file;
+                                $update_file = $theme_slug;
                                 break;
                         }
                 }