<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16715] trunk/wp-admin/theme-editor.php: Remove unused logic.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16715">16715</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-04 04:16:23 +0000 (Sat, 04 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused logic. see <a href="http://trac.wordpress.org/ticket/15672">#15672</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (16714 => 16715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-12-04 03:52:59 UTC (rev 16714)
+++ trunk/wp-admin/theme-editor.php 2010-12-04 04:16:23 UTC (rev 16715)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> <?php endif;
</span><span class="cx">
</span><span class="cx"> $description = get_file_description($file);
</span><del>-$desc_header = ( $description != $file_show ) ? "$description <span>(%s)</span>" : "<span>%s</span>";
</del><ins>+$desc_header = ( $description != $file_show ) ? "$description <span>($file_show)</span>" : $file_show;
</ins><span class="cx">
</span><span class="cx"> $is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
</span><span class="cx"> ?>
</span><span class="lines">@@ -135,12 +135,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="fileedit-sub">
</span><span class="cx"> <div class="alignleft">
</span><del>-<h3><?php
-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>
</del><ins>+<h3><?php echo $themes[$theme]['Name'] . ': ' . $desc_header; ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="alignright">
</span><span class="cx"> <form action="theme-editor.php" method="post">
</span><span class="lines">@@ -182,16 +177,7 @@
</span><span class="cx"> $template_show = basename($template_file);
</span><span class="cx"> $filedesc = ( $description != $template_file ) ? "$description<br /><span class='nonessential'>($template_show)</span>" : "$description";
</span><span class="cx"> $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($template_show)</span></span>" : $filedesc;
</span><del>-
- // 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 );
- }
</del><ins>+ $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
</ins><span class="cx"> }
</span><span class="cx"> ksort( $template_mapping );
</span><span class="cx"> while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :
</span></span></pre>
</div>
</div>
</body>
</html>