WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused logic. see #15672. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-04 04:16:23 +00:00
parent c7fe205805
commit 3fb64e512a
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ default:
<?php endif; <?php endif;
$description = get_file_description($file); $description = get_file_description($file);
$desc_header = ( $description != $file_show ) ? "$description <span>(%s)</span>" : "<span>%s</span>"; $desc_header = ( $description != $file_show ) ? "$description <span>($file_show)</span>" : $file_show;
$is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet']; $is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
?> ?>
@ -135,12 +135,7 @@ $is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
<div class="fileedit-sub"> <div class="fileedit-sub">
<div class="alignleft"> <div class="alignleft">
<h3><?php <h3><?php echo $themes[$theme]['Name'] . ': ' . $desc_header; ?></h3>
if ( $is_child_theme && strpos( $file, $themes[$theme]['Template Dir'] ) === 0 )
echo $themes[$theme]['Parent Theme'] . ': ';
else
echo $themes[$theme]['Name'] . ': ';
printf( $desc_header, $file_show ); ?></h3>
</div> </div>
<div class="alignright"> <div class="alignright">
<form action="theme-editor.php" method="post"> <form action="theme-editor.php" method="post">
@ -182,16 +177,7 @@ if ($allowed_files) :
$template_show = basename($template_file); $template_show = basename($template_file);
$filedesc = ( $description != $template_file ) ? "$description<br /><span class='nonessential'>($template_show)</span>" : "$description"; $filedesc = ( $description != $template_file ) ? "$description<br /><span class='nonessential'>($template_show)</span>" : "$description";
$filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($template_show)</span></span>" : $filedesc; $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($template_show)</span></span>" : $filedesc;
$template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $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( _get_template_edit_filename($template_file, $template_dir), $filedesc );
}
} else {
$template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
}
} }
ksort( $template_mapping ); ksort( $template_mapping );
while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) : while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :