Ticket #11969: theme-editor.2.diff

wp-admin/theme-editor.php

@@ -31 +31 @@
         wp_die(__('The requested theme does not exist.'));
 
 $allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
-
+$requestedfile = $file;
 if (empty($file)) {
         $file = $allowed_files[0];
 } else {
@@ -55 +55 @@
 
         $newcontent = stripslashes($_POST['newcontent']);
         $theme = urlencode($theme);
+        
+        $location = add_query_arg(array('file' => $requestedfile, 'theme' => $theme, 'scrollto' => $scrollto, 'dir' => $dir ), admin_url('theme-editor.php'));
+
         if (is_writeable($file)) {
                 //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
                 $f = fopen($file, 'w+');
                 if ($f !== FALSE) {
                         fwrite($f, $newcontent);
                         fclose($f);
-                        $location = "theme-editor.php?file=$file&theme=$theme&a=te&scrollto=$scrollto";
-                } else {
-                        $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
+                        $location = add_query_arg('a', 'te', $location);
                 }
-        } else {
-                $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
         }
 
         $location = wp_kses_no_null($location);
@@ -169 +168 @@
         ksort( $template_mapping );
         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) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>
+                <li><a href="<?php echo add_query_arg( array('file' => $template_file, 'theme' => urlencode($theme), 'dir' => 'theme'), admin_url('theme-editor.php') ); ?>"><?php echo $filedesc ?></a></li>
 <?php endwhile; ?>
         </ul>
         <h3><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h3>
@@ -197 +196 @@
         <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
                  <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea>
                  <input type="hidden" name="action" value="update" />
-                 <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
+                 <input type="hidden" name="file" value="<?php echo esc_attr($requestedfile) ?>" />
+                 <input type="hidden" name="dir" value="<?php echo esc_attr($dir) ?>" />
                  <input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />
                  <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
                  </div>
-        <?php if ( isset($functions ) && count($functions) ) { ?>
+        <?php if ( !empty($functions) ) { ?>
                 <div id="documentation">
                 <label for="docs-list"><?php _e('Documentation:') ?></label>
                 <?php echo $docs_select; ?>