Changeset 20524

Timestamp:

04/19/2012 03:33:42 AM (11 years ago)

Author:

nacin

Message:

Always return a WP_Theme object from wp_get_theme(). If we can't find the theme root, assume the default theme root. (Which will probably result in a WP_Theme object that returns false for the exists() method, which is fine.) see #20361.

File:

• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -99 +99 @@
         $theme_root = get_raw_theme_root( $stylesheet );
         if ( false === $theme_root )
-            return false;
-
-        if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
+            $theme_root = WP_CONTENT_DIR . $theme_root;
+        elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
             $theme_root = WP_CONTENT_DIR . $theme_root;
     }