Changeset 20363

Timestamp:

04/05/2012 01:05:49 AM (13 years ago)

Author:

nacin

Message:

Always return a WP_Theme object from wp_get_theme(). Check \$theme->exists() or \$theme->errors() to confirm the requested theme actually exists. see #20361.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/theme.php (modified) (3 diffs)

trunk/wp-admin/includes/schema.php

@@ -345 +345 @@
     // If default theme is a child theme, we need to get its template
     $theme = wp_get_theme( $template );
-    if ( $theme && ! $theme->errors() )
+    if ( ! $theme->errors() )
         $template = $theme->get_template();
 

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|bool WP_Theme object. False if the theme is not found.
+ * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
  */
 function wp_get_theme( $stylesheet = null, $theme_root = null ) {
@@ -105 +105 @@
     }
 
-    $theme = new WP_Theme( $stylesheet, $theme_root );
-    if ( $theme->exists() )
-        return $theme;
-
-    return false;
+    return new WP_Theme( $stylesheet, $theme_root );
 }
 
@@ -1557 +1553 @@
         $old_theme = wp_get_theme( $stylesheet );
 
-        // If we can't find the old theme then fallback to passing the raw data to the action like we did pre-3.4
-        if ( $old_theme )
+        if ( $old_theme->exists() )
             do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );
         else