<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[12063] trunk/wp-admin:
Display a smaller filename in the theme editor urls and make theme files editable again
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12063">12063</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-10-19 21:39:04 +0000 (Mon, 19 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Display a smaller filename in the theme editor urls and make theme files editable again. Fixes <a href="http://trac.wordpress.org/ticket/10974">#10974</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (12062 => 12063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2009-10-19 21:28:44 UTC (rev 12062)
+++ trunk/wp-admin/includes/theme.php 2009-10-19 21:39:04 UTC (rev 12063)
</span><span class="lines">@@ -146,4 +146,18 @@
</span><span class="cx"> return $page_templates;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Tidies a filename for url display by the theme editor.
+ *
+ * @since 2.9.0
+ * @private
+ *
+ * @param string $fullpath Full path to the theme file
+ * @param string $containingfolder Path of the theme parent folder
+ * @return string
+ */
+function _get_template_edit_filename($fullpath, $containingfolder) {
+ return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (12062 => 12063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2009-10-19 21:28:44 UTC (rev 12062)
+++ trunk/wp-admin/theme-editor.php 2009-10-19 21:39:04 UTC (rev 12063)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __("Edit Themes");
</span><span class="cx"> $parent_file = 'themes.php';
</span><span class="cx">
</span><del>-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme'));
</del><ins>+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));
</ins><span class="cx">
</span><span class="cx"> wp_admin_css( 'theme-editor' );
</span><span class="cx">
</span><span class="lines">@@ -34,10 +34,15 @@
</span><span class="cx">
</span><span class="cx"> if (empty($file)) {
</span><span class="cx"> $file = $allowed_files[0];
</span><ins>+} else {
+ if ( 'theme' == $dir ) {
+ $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ;
+ } else if ( 'style' == $dir) {
+ $file = dirname(dirname($themes[$theme]['Stylesheer Dir'])) . $file ;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-$file = validate_file_to_edit($file, $allowed_files);
-$real_file = get_real_file_to_edit($file);
</del><ins>+$real_file = validate_file_to_edit($file, $allowed_files);
</ins><span class="cx"> $scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
</span><span class="cx">
</span><span class="cx"> $file_show = basename( $file );
</span><span class="lines">@@ -157,33 +162,34 @@
</span><span class="cx"> // This means that we display the correct files for child themes which overload Templates as well as Styles
</span><span class="cx"> if( array_key_exists($description, $template_mapping ) ) {
</span><span class="cx"> if ( false !== strpos( $template_file, $template_dir ) ) {
</span><del>- $template_mapping[ $description ] = array( $template_file, $filedesc );
</del><ins>+ $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $template_mapping[ $description ] = array( $template_file, $filedesc );
</del><ins>+ $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
</ins><span class="cx"> }
</span><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 class="cx"> ?>
</span><del>- <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
</del><ins>+ <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>
</ins><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <h4><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h4>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><span class="cx"> $template_mapping = array();
</span><ins>+ $stylesheet_dir = $themes[$theme]['Stylesheet Dir'];
</ins><span class="cx"> foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
</span><span class="cx"> $description = trim( get_file_description($style_file) );
</span><span class="cx"> $style_show = basename($style_file);
</span><span class="cx"> $filedesc = ( $description != $style_file ) ? "$description <span class='nonessential'>($style_show)</span>" : "$description";
</span><span class="cx"> $filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($style_show)</span></span>" : $filedesc;
</span><del>- $template_mapping[ $description ] = array( $style_file, $filedesc );
</del><ins>+ $template_mapping[ $description ] = array( _get_template_edit_filename($style_file, $style_file), $filedesc );
</ins><span class="cx"> }
</span><span class="cx"> ksort( $template_mapping );
</span><span class="cx"> while ( list( $template_sorted_key, list( $style_file, $filedesc ) ) = each( $template_mapping ) ) :
</span><span class="cx"> ?>
</span><del>- <li><a href="theme-editor.php?file=<?php echo "$style_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
</del><ins>+ <li><a href="theme-editor.php?file=<?php echo "$style_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=style"><?php echo $filedesc ?></a></li>
</ins><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>