Ticket #19089: 19089.patch

wp-admin/includes/dashboard.php

@@ -387 +387 @@
         $ct = current_theme_info();
 
         echo "\n\t<p>";
-        if ( !empty($wp_registered_sidebars) ) {
+
+        if ( empty($ct->stylesheet_dir) ) {
+                if ( !is_multisite() || is_super_admin() )
+                        echo '<span class="error-message">' . __('ERROR: the themes directory is either empty or doesn\'t exist. Please check your installation.') . '</span>';
+        } elseif ( !empty($wp_registered_sidebars) ) {
                 $sidebars_widgets = wp_get_sidebars_widgets();
                 $num_widgets = 0;
                 foreach ( (array) $sidebars_widgets as $k => $v ) {

wp-includes/theme.php

@@ -518 +518 @@
                 return $theme;
 
         $themes = get_themes();
-        $theme_names = array_keys($themes);
-        $current_template = get_option('template');
-        $current_stylesheet = get_option('stylesheet');
         $current_theme = 'Twenty Ten';
 
-        if ( $themes ) {
+        if ( $themes && is_array($themes) ) {
+                $theme_names = array_keys($themes);
+
                 foreach ( (array) $theme_names as $theme_name ) {
-                        if ( $themes[$theme_name]['Stylesheet'] == $current_stylesheet &&
-                                        $themes[$theme_name]['Template'] == $current_template ) {
+                        if ( $themes[$theme_name]['Stylesheet'] == get_option('stylesheet') &&
+                                        $themes[$theme_name]['Template'] == get_option('template') ) {
                                 $current_theme = $themes[$theme_name]['Name'];
                                 break;
                         }