Changeset 10047 for trunk/wp-admin/theme-editor.php

Timestamp:

12/04/2008 09:29:55 PM (16 years ago)

Author:

westi

Message:

Ensure that the theme-editor displays the correct files when a child theme overrides templates. Fixes #8236 props roganty.

File:

• trunk/wp-admin/theme-editor.php (modified) (2 diffs)

trunk/wp-admin/theme-editor.php

@@ -136 +136 @@
 <?php
     $template_mapping = array();
+    $template_dir = $themes[$theme]['Template Dir'];
     foreach($themes[$theme]['Template Files'] as $template_file) {
         $description = trim( get_file_description($template_file) );
@@ -141 +142 @@
         $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
         $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;
-        $template_mapping[ $description ] = array( $template_file, $filedesc );
+        
+        // If we have two files of the same name prefer the one in the Template Directory
+        // This means that we display the correct files for child themes which overload Templates as well as Styles
+        if( array_key_exists($description, $template_mapping ) ) {
+            if ( false !== strpos( $template_file, $template_dir ) )  { 
+                $template_mapping[ $description ] = array( $template_file, $filedesc );
+            }
+        } else {
+            $template_mapping[ $description ] = array( $template_file, $filedesc );
+        }
     }
     ksort( $template_mapping );