Changes in trunk/wp-includes/theme.php [12135:12226]

File:

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

trunk/wp-includes/theme.php

@@ -317 +317 @@
                  * so lets use the theme root for the parent template.
                  */
-                $parent_theme_root = $theme_files[$template]['theme_root'];
-                if ( file_exists( "$parent_theme_root/$template/index.php" ) ) {
-                    $template_directory = "$parent_theme_root/$template";
+                if ( isset($theme_files[$template]) && file_exists( $theme_files[$template]['theme_root'] . "/$template/index.php" ) ) {
+                    $template_directory = $theme_files[$template]['theme_root'] . "/$template";
                 } else {
                     $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.'));
@@ -367 +366 @@
         }
 
+        //Make unique and remove duplicates when stylesheet and template are the same i.e. most themes
+        $template_files = array_unique($template_files);
+        $stylesheet_files = array_unique($stylesheet_files);
+                
         $template_dir = dirname($template_files[0]);
         $stylesheet_dir = dirname($stylesheet_files[0]);
@@ -597 +600 @@
             @closedir( $theme_dir );
     }
-
     return $theme_files;
 }