Changeset 12119

Timestamp:

10/27/2009 05:32:12 PM (12 years ago)

Author:

ryan

Message:

Theme subdirs that contain themes are not broken if missing a stylesheet. see #10467

File:

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

trunk/wp-includes/theme.php

@@ -566 +566 @@
                     $theme_subdirs = @opendir( $subdir );
 
+                    $found_subdir_themes = false;
                     while ( ($theme_subdir = readdir($theme_subdirs)) !== false ) {
                         if ( is_dir( $subdir . '/' . $theme_subdir) && is_readable($subdir . '/' . $theme_subdir) ) {
@@ -578 +579 @@
                                     $theme_files["$theme_dir/$theme_subdir"] = array( 'theme_file' => $subdir_name . '/' . $theme_subdir . '/' . $theme_file, 'theme_root' => $theme_root );
                                     $found_stylesheet = true;
+                                    $found_subdir_themes = true;
                                     break;
                                 }
@@ -585 +587 @@
                     }
                     @closedir($theme_subdir);
-                    $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.'));
+                    if ( !$found_subdir_themes )
+                        $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.'));
                 }
             }