Ticket #11216: 11216.diff

wp-includes/theme.php

@@ -375 +375 @@
                                         while ( ($subfile = $template_subdir->read()) !== false ) {
                                                 if ( preg_match('|^\.+$|', $subfile) )
                                                         continue;
-                                                if ( preg_match('|\.php$|', $subfile) )
+                                                if ( preg_match('|\.php$|', $subfile) ) {
                                                         $template_files[] = "$template_directory/$file/$subfile";
+                                                }
+                                                // Let's go a second level deep, for good measure (and to play nice with well-organized theme frameworks)
+                                                elseif ( is_dir("$template_directory/$file/$subfile") ) {
+                                                        $template_subdir_subdir = @ dir("$template_directory/$file/$subfile");
+                                                        if ( !$template_subdir_subdir )
+                                                                continue;
+                                                        while ( ($sub_subfile = $template_subdir_subdir->read()) !== false ) {
+                                                                if ( preg_match('|^\.+$|', $sub_subfile) )
+                                                                        continue;
+                                                                if ( preg_match('|\.php$|', $sub_subfile) )
+                                                                        $template_files[] = "$template_directory/$file/$subfile/$sub_subfile";
+                                                        }
+                                                        @ $template_subdir_subdir->close();
+                                                }
                                         }
                                         @ $template_subdir->close();
                                 }

wp-admin/includes/theme.php

@@ -175 +175 @@
                 foreach ( $templates as $template ) {
                         $basename = str_replace($base, '', $template);
 
-                        // don't allow template files in subdirectories
-                        if ( false !== strpos($basename, '/') )
-                                continue;
-
                         $template_data = implode( '', file( $template ));
 
                         $name = '';
@@ -190 +186 @@
                         }
                 }
         }
-
-        return $page_templates;
+        
+        return apply_filters( 'available_page_templates', $page_templates );
 }
 
 /**