Changeset 20312 for trunk/wp-includes/theme.php

Timestamp:

03/29/2012 02:59:48 AM (13 years ago)

Author:

nacin

Message:

Introduce WP_Theme->exists() to check if the queried theme actually exists. WP_Theme->exists() is a subset of errors() -- a theme with errors may still exist, but a theme that does not exist has an error of theme_not_found. wp_get_theme() now returns false if the theme does not exist. Improve scandir() and get_files() logic. see #20103.

File:

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

trunk/wp-includes/theme.php

@@ -88 +88 @@
  * @param string $theme_root Absolute path of the theme root to look in. Optional. If not specified, get_raw_theme_root()
  *  is used to calculate the theme root for the $stylesheet provided (or current theme).
- * @return WP_Theme
+ * @return WP_Theme|bool WP_Theme object. False if the theme is not found.
  */
 function wp_get_theme( $stylesheet = null, $theme_root = null ) {
@@ -98 +98 @@
     if ( empty( $theme_root ) ) {
         $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;
     }
 
-    return new WP_Theme( $stylesheet, $theme_root );
+    $theme = new WP_Theme( $stylesheet, $theme_root );
+    if ( $theme->exists() )
+        return $theme;
+
+    return false;
 }