Changeset 10835

Timestamp:

03/25/2009 04:51:08 PM (16 years ago)

Author:

ryan

Message:

Show template files in subdirs. Props DD32. fixes #4131

Location:

trunk

Files:

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

trunk/wp-admin/includes/theme.php

@@ -140 +140 @@
 
             if ( !empty( $name ) ) {
-                $page_templates[trim( $name )] = basename( $template );
+                $page_templates[trim( $name )] = theme_basename( $template );
             }
         }

trunk/wp-admin/theme-editor.php

@@ -152 +152 @@
     $template_mapping = array();
     $template_dir = $themes[$theme]['Template Dir'];
-    foreach($themes[$theme]['Template Files'] as $template_file) {
+    foreach ( $themes[$theme]['Template Files'] as $template_file ) {
         $description = trim( get_file_description($template_file) );
         $template_show = basename($template_file);
@@ -178 +178 @@
 <?php
     $template_mapping = array();
-    foreach($themes[$theme]['Stylesheet Files'] as $style_file) {
+    foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
         $description = trim( get_file_description($style_file) );
         $style_show = basename($style_file);
@@ -205 +205 @@
     <?php if ( isset($functions ) && count($functions) ) { ?>
         <div id="documentation">
-        <label for="docs-list">Documentation:</label>
+        <label for="docs-list"><?php _e('Documentation:') ?></label>
         <?php echo $docs_select; ?>
         <input type="button" class="button" value=" <?php _e( 'Lookup' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" />

trunk/wp-includes/theme.php

@@ -373 +373 @@
                 }
             }
-        }
-
+            @ $stylesheet_dir->close();
+        }
+        
         $template_dir = @ dir("$theme_root/$template");
         if ( $template_dir ) {
-            while(($file = $template_dir->read()) !== false) {
-                if ( !preg_match('|^\.+$|', $file) && preg_match('|\.php$|', $file) )
+            while ( ($file = $template_dir->read()) !== false ) {
+                if ( preg_match('|^\.+$|', $file) )
+                    continue;
+                if ( preg_match('|\.php$|', $file) ) {
                     $template_files[] = "$theme_loc/$template/$file";
+                } elseif ( is_dir("$theme_root/$template/$file") ) {
+                    $template_subdir = @ dir("$theme_root/$template/$file");
+                    while ( ($subfile = $template_subdir->read()) !== false ) {
+                        if ( preg_match('|^\.+$|', $subfile) )
+                            continue;
+                        if ( preg_match('|\.php$|', $subfile) )
+                            $template_files[] = "$theme_loc/$template/$file/$subfile";
+                    }
+                    @ $template_subdir->close();
+                }
             }
+            @ $template_dir->close(); 
         }
 
@@ -1118 +1132 @@
 }
 
+/**
+ * Get the basename of a theme.
+ *
+ * This method extracts the filename of a theme file from a path
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 2.8.0
+ *
+ * @access private
+ *
+ * @param string $file The filename of a theme file
+ * @return string The filename relative to the themes folder
+ */
+function theme_basename($file) {
+    $file = str_replace('\\','/',$file); // sanitize for Win32 installs
+    $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
+    $theme_dir = str_replace('\\','/', get_theme_root()); // sanitize for Win32 installs
+    $theme_dir = preg_replace('|/+|','/', $theme_dir); // remove any duplicate slash
+    $file = preg_replace('|^.*/themes/.*?/|','',$file); // get relative path from theme dir 
+    return $file;
+}
+
 ?>