Changeset 12129

Timestamp:

10/30/2009 12:18:15 AM (14 years ago)

Author:

ryan

Message:

get_themes() and theme root fixes. see #10467

File:

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

trunk/wp-includes/theme.php

@@ -264 +264 @@
     asort( $theme_files );
 
+    $wp_themes = array();
+
     foreach ( (array) $theme_files as $theme_file ) {
         $theme_root = $theme_file['theme_root'];
@@ -309 +311 @@
             if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) {
                 $template = "$parent_dir/$template";
-                $template_directory = "$theme_root/$parent_dir/$template";
+                $template_directory = "$theme_root/$template";
             } else {
                 /**
@@ -317 +319 @@
                 $parent_theme_root = $theme_files[$template]['theme_root'];
                 if ( file_exists( "$parent_theme_root/$template/index.php" ) ) {
-                    $template = "$parent_theme_root/$template";
+                    $template_directory = "$parent_theme_root/$template";
                 } else {
                     $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.'));
@@ -377 +379 @@
         // theme is first keeps the name.  Subsequent themes get a suffix applied.
         // The Default and Classic themes always trump their pretenders.
-        if ( isset($themes[$name]) ) {
+        if ( isset($wp_themes[$name]) ) {
             if ( ('WordPress Default' == $name || 'WordPress Classic' == $name) &&
                      ('default' == $stylesheet || 'classic' == $stylesheet) ) {
                 // If another theme has claimed to be one of our default themes, move
                 // them aside.
-                $suffix = $themes[$name]['Stylesheet'];
+                $suffix = $wp_themes[$name]['Stylesheet'];
                 $new_name = "$name/$suffix";
-                $themes[$new_name] = $themes[$name];
-                $themes[$new_name]['Name'] = $new_name;
+                $wp_themes[$new_name] = $wp_themes[$name];
+                $wp_themes[$new_name]['Name'] = $new_name;
             } else {
                 $name = "$name/$stylesheet";
@@ -392 +394 @@
 
         $theme_roots[$stylesheet] = str_replace( WP_CONTENT_DIR, '', $theme_root );
-        $themes[$name] = array( 'Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot, 'Tags' => $theme_data['Tags'], 'Theme Root' => $theme_root, 'Theme Root URI' => str_replace( WP_CONTENT_DIR, content_url(), $theme_root ) );
+        $wp_themes[$name] = array( 'Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot, 'Tags' => $theme_data['Tags'], 'Theme Root' => $theme_root, 'Theme Root URI' => str_replace( WP_CONTENT_DIR, content_url(), $theme_root ) );
     }
 
-    /* Resolve theme dependencies. */
-    $theme_names = array_keys( $themes );
+    unset($theme_files);
 
     /* Store theme roots in the DB */
     if ( get_site_transient( 'theme_roots' ) != $theme_roots )
         set_site_transient( 'theme_roots', $theme_roots, 7200 ); // cache for two hours
-
+    unset($theme_roots);
+
+    /* Resolve theme dependencies. */
+    $theme_names = array_keys( $wp_themes );
     foreach ( (array) $theme_names as $theme_name ) {
-        $themes[$theme_name]['Parent Theme'] = '';
-        if ( $themes[$theme_name]['Stylesheet'] != $themes[$theme_name]['Template'] ) {
+        $wp_themes[$theme_name]['Parent Theme'] = '';
+        if ( $wp_themes[$theme_name]['Stylesheet'] != $wp_themes[$theme_name]['Template'] ) {
             foreach ( (array) $theme_names as $parent_theme_name ) {
-                if ( ($themes[$parent_theme_name]['Stylesheet'] == $themes[$parent_theme_name]['Template']) && ($themes[$parent_theme_name]['Template'] == $themes[$theme_name]['Template']) ) {
-                    $themes[$theme_name]['Parent Theme'] = $themes[$parent_theme_name]['Name'];
+                if ( ($wp_themes[$parent_theme_name]['Stylesheet'] == $wp_themes[$parent_theme_name]['Template']) && ($wp_themes[$parent_theme_name]['Template'] == $wp_themes[$theme_name]['Template']) ) {
+                    $wp_themes[$theme_name]['Parent Theme'] = $wp_themes[$parent_theme_name]['Name'];
                     break;
                 }
@@ -414 +418 @@
     }
 
-    $wp_themes = $themes;
-
-    return $themes;
+    return $wp_themes;
 }