Changeset 12063

Timestamp:

10/19/2009 09:39:04 PM (15 years ago)

Author:

westi

Message:

Display a smaller filename in the theme editor urls and make theme files editable again. Fixes #10974.

Location:

trunk/wp-admin

Files:

• includes/theme.php (modified) (1 diff)
• theme-editor.php (modified) (6 diffs)

trunk/wp-admin/includes/theme.php

@@ -147 +147 @@
 }
 
+/**
+ * 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);
+}
+
 ?>

trunk/wp-admin/theme-editor.php

@@ -16 +16 @@
 $parent_file = 'themes.php';
 
-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme'));
+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));
 
 wp_admin_css( 'theme-editor' );
@@ -35 +35 @@
 if (empty($file)) {
     $file = $allowed_files[0];
-}
-
-$file = validate_file_to_edit($file, $allowed_files);
-$real_file = get_real_file_to_edit($file);
+} else {
+    if ( 'theme' == $dir ) {
+        $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ; 
+    } else if ( 'style' == $dir) {
+        $file = dirname(dirname($themes[$theme]['Stylesheer Dir'])) . $file ; 
+    }
+}
+
+$real_file = validate_file_to_edit($file, $allowed_files);
 $scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
@@ -158 +163 @@
         if( array_key_exists($description, $template_mapping ) ) {
             if ( false !== strpos( $template_file, $template_dir ) )  {
-                $template_mapping[ $description ] = array( $template_file, $filedesc );
+                $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
             }
         } else {
-            $template_mapping[ $description ] = array( $template_file, $filedesc );
+            $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
         }
     }
@@ -167 +172 @@
     while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :
     ?>
-        <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
+        <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>
 <?php endwhile; ?>
     </ul>
@@ -174 +179 @@
 <?php
     $template_mapping = array();
+    $stylesheet_dir = $themes[$theme]['Stylesheet Dir'];
     foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
         $description = trim( get_file_description($style_file) );
@@ -179 +185 @@
         $filedesc = ( $description != $style_file ) ? "$description <span class='nonessential'>($style_show)</span>" : "$description";
         $filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($style_show)</span></span>" : $filedesc;
-        $template_mapping[ $description ] = array( $style_file, $filedesc );
+        $template_mapping[ $description ] = array( _get_template_edit_filename($style_file, $style_file), $filedesc );
     }
     ksort( $template_mapping );
     while ( list( $template_sorted_key, list( $style_file, $filedesc ) ) = each( $template_mapping ) ) :
         ?>
-        <li><a href="theme-editor.php?file=<?php echo "$style_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
+        <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>
 <?php endwhile; ?>
     </ul>