Changeset 12118

Timestamp:

10/27/2009 05:17:23 PM (16 years ago)

Author:

ryan

Message:

More theme subdir fixes. see #10467

File:

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

trunk/wp-includes/theme.php

@@ -297 +297 @@
 
         if ( empty($template) ) {
-            if ( file_exists(dirname("$theme_root/$theme_file/index.php")) )
-                $template = dirname($theme_file);
+            if ( file_exists("$theme_root/$stylesheet/index.php") )
+                $template = $stylesheet;
             else
                 continue;
@@ -308 +308 @@
             $parent_dir = dirname(dirname($theme_file));
             if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) {
-                $template = "$theme_root/$parent_dir/$template";
+                $template = "$parent_dir/$template";
+                $template_directory = "$theme_root/$parent_dir/$template";
             } else {
                 /**
@@ -324 +325 @@
             }
         } else {
-            $template = trim( $theme_root . '/' . $template );
+            $template_directory = trim( $theme_root . '/' . $template );
         }
 
@@ -343 +344 @@
         }
 
-        $template_dir = @ dir("$template");
+        $template_dir = @ dir("$template_directory");
         if ( $template_dir ) {
             while ( ($file = $template_dir->read()) !== false ) {
@@ -349 +350 @@
                     continue;
                 if ( preg_match('|\.php$|', $file) ) {
-                    $template_files[] = "$template/$file";
-                } elseif ( is_dir("$template/$file") ) {
-                    $template_subdir = @ dir("$template/$file");
+                    $template_files[] = "$template_directory/$file";
+                } elseif ( is_dir("$template_directory/$file") ) {
+                    $template_subdir = @ dir("$template_directory/$file");
                     while ( ($subfile = $template_subdir->read()) !== false ) {
                         if ( preg_match('|^\.+$|', $subfile) )
                             continue;
                         if ( preg_match('|\.php$|', $subfile) )
-                            $template_files[] = "$template/$file/$subfile";
+                            $template_files[] = "$template_directory/$file/$subfile";
                     }
                     @ $template_subdir->close();
@@ -391 +392 @@
 
         $theme_roots[$stylesheet] = str_replace( WP_CONTENT_DIR, '', $theme_root );
-        $themes[$name] = array( 'Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => basename( $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 ) );
+        $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 ) );
     }