Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-12-04 21:29:55 +00:00
parent 8b192860f2
commit 781708a9ce
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/theme-editor.php
View File

@ -135,12 +135,22 @@ if ($allowed_files) :
<ul>
<?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) );
$template_show = basename($template_file);
$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 );
while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :