Ticket #35521: 35521.3.diff

wp-admin/theme-install.php

@@ -28 +28 @@
 }
 
 $installed_themes = search_theme_directories();
-foreach ( $installed_themes as $k => $v ) {
-        if ( false !== strpos( $k, '/' ) ) {
-                unset( $installed_themes[ $k ] );
+if ( is_array($installed_themes) ) {
+        foreach ( $installed_themes as $k => $v ) {
+                if ( false !== strpos( $k, '/' ) ) {
+                        unset( $installed_themes[ $k ] );
+                }
         }
 }
 

wp-includes/class-wp-theme.php

@@ -281 +281 @@
                         $parent_dir = dirname( $this->stylesheet );
                         if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
                                 $this->template = $parent_dir . '/' . $this->template;
-                        } elseif ( ( $directories = search_theme_directories() ) && isset( $directories[ $this->template ] ) ) {
+                        } elseif ( ( $directories = search_theme_directories() ) && is_array($directories) && isset( $directories[ $this->template ] ) ) {
                                 // Look for the template in the search_theme_directories() results, in case it is in another theme root.
                                 // We don't look into directories of themes, just the theme root.
                                 $theme_root_template = $directories[ $this->template ]['theme_root'];