Changeset 20375

Timestamp:

04/05/2012 08:38:42 PM (13 years ago)

Author:

nacin

Message:

Internally cache themes inside wp_get_themes() by theme_root as well as stylesheet, to avoid conflicts with future calls to wp_get_themes(). Always return only the last stylesheet found, as before. see #20103.

File:

• trunk/wp-includes/theme.php (modified) (2 diffs)

trunk/wp-includes/theme.php

@@ -64 +64 @@
 
     foreach ( $theme_directories as $theme => $theme_root ) {
-        if ( isset( $_themes[ $theme ] ) )
-            $themes[ $theme ] = $_themes[ $theme ];
+        if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
+            $themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
         else
-            $themes[ $theme ] = $_themes[ $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+            $themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
     }
 
@@ -325 +325 @@
 
     $found_themes = array();
+
+    $wp_theme_directories = (array) $wp_theme_directories;
 
     // Set up maybe-relative, maybe-absolute array of theme directories.