WordPress.org

Make WordPress Core

Changeset 16715


Ignore:
Timestamp:
12/04/2010 04:16:23 AM (10 years ago)
Author:
nacin
Message:

Remove unused logic. see #15672.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/theme-editor.php

    r16714 r16715  
    126126
    127127$description = get_file_description($file);
    128 $desc_header = ( $description != $file_show ) ? "$description <span>(%s)</span>" : "<span>%s</span>";
     128$desc_header = ( $description != $file_show ) ? "$description <span>($file_show)</span>" : $file_show;
    129129
    130130$is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
     
    136136<div class="fileedit-sub">
    137137<div class="alignleft">
    138 <h3><?php
    139 if ( $is_child_theme && strpos( $file, $themes[$theme]['Template Dir'] ) === 0 )
    140     echo $themes[$theme]['Parent Theme'] . ': ';
    141 else
    142     echo $themes[$theme]['Name'] . ': ';
    143 printf( $desc_header, $file_show ); ?></h3>
     138<h3><?php echo $themes[$theme]['Name'] . ': ' . $desc_header; ?></h3>
    144139</div>
    145140<div class="alignright">
     
    183178        $filedesc = ( $description != $template_file ) ? "$description<br /><span class='nonessential'>($template_show)</span>" : "$description";
    184179        $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($template_show)</span></span>" : $filedesc;
    185 
    186         // If we have two files of the same name prefer the one in the Template Directory
    187         // This means that we display the correct files for child themes which overload Templates as well as Styles
    188         if ( array_key_exists($description, $template_mapping ) ) {
    189             if ( false !== strpos( $template_file, $template_dir ) )  {
    190                 $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
    191             }
    192         } else {
    193             $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
    194         }
     180        $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
    195181    }
    196182    ksort( $template_mapping );
Note: See TracChangeset for help on using the changeset viewer.