Changes in trunk/wp-admin/theme-editor.php [17471:15135]

File:

• trunk/wp-admin/theme-editor.php (modified) (14 diffs)

trunk/wp-admin/theme-editor.php

@@ -10 +10 @@
 require_once('./admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
-        wp_redirect( network_admin_url( 'theme-editor.php' ) );
-        exit();
-}
-
 if ( !current_user_can('edit_themes') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
@@ -27 +22 @@
 $help .= '<p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>';
 $help .= '<p>' . __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="http://codex.wordpress.org/Child_Themes" target="_blank">child theme</a> instead.') . '</p>';
-if ( is_network_admin() )
-        $help .= '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>';
 $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
 $help .= '<p>' . __('<a href="http://codex.wordpress.org/Theme_Development" target="_blank">Documentation on Theme Development</a>') . '</p>';
@@ -52 +45 @@
         wp_die(__('The requested theme does not exist.'));
 
-$allowed_files = array_merge( $themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files'] );
-
-if ( empty( $file ) ) {
-        if ( false !== array_search( $themes[$theme]['Stylesheet Dir'] . '/style.css', $allowed_files ) )
-                $file = $themes[$theme]['Stylesheet Dir'] . '/style.css';
-        else
-                $file = $allowed_files[0];
+$allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
+
+if (empty($file)) {
+        $file = $allowed_files[0];
 } else {
         $file = stripslashes($file);
@@ -104 +94 @@
 default:
 
-        require_once(ABSPATH . 'wp-admin/admin-header.php');
+        require_once('./admin-header.php');
 
         update_recently_edited($file);
@@ -111 +101 @@
                 $error = 1;
 
-        $content = '';
         if ( !$error && filesize($file) > 0 ) {
                 $f = fopen($file, 'r');
@@ -127 +116 @@
                 }
 
-                $content = esc_textarea( $content );
+                $content = htmlspecialchars( $content );
         }
 
@@ -136 +125 @@
 
 $description = get_file_description($file);
-$desc_header = ( $description != $file_show ) ? "$description <span>($file_show)</span>" : $file_show;
-
-$is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
+$desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (%s)" : "%s";
 ?>
 <div class="wrap">
@@ -146 +133 @@
 <div class="fileedit-sub">
 <div class="alignleft">
-<h3><?php echo $themes[$theme]['Name'] . ': ' . $desc_header; ?></h3>
+<big><?php echo sprintf($desc_header, $file_show); ?></big>
 </div>
 <div class="alignright">
@@ -162 +149 @@
 ?>
                 </select>
-                <?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
+                <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
         </form>
 </div>
@@ -168 +155 @@
 </div>
         <div id="templateside">
+
 <?php
 if ($allowed_files) :
 ?>
         <h3><?php _e('Templates'); ?></h3>
-        <?php if ( $is_child_theme ) : ?>
-        <p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), $themes[$theme]['Parent Theme'] ); ?></p>
-        <?php endif; ?>
         <ul>
 <?php
@@ -180 +165 @@
         $template_dir = $themes[$theme]['Template Dir'];
         foreach ( $themes[$theme]['Template Files'] as $template_file ) {
-                // Don't show parent templates.
-                if ( $is_child_theme && strpos( $template_file, trailingslashit( $template_dir ) ) === 0 )
-                        continue;
-
                 $description = trim( get_file_description($template_file) );
                 $template_show = basename($template_file);
                 $filedesc = ( $description != $template_file ) ? "$description<br /><span class='nonessential'>($template_show)</span>" : "$description";
                 $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($template_show)</span></span>" : $filedesc;
-                $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
+
+                // 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 );
+                }
         }
         ksort( $template_mapping );
@@ -202 +192 @@
         $stylesheet_dir = $themes[$theme]['Stylesheet Dir'];
         foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
-                // Don't show parent styles.
-                if ( $is_child_theme && strpos( $style_file, trailingslashit( $template_dir ) ) === 0 )
-                        continue;
-
                 $description = trim( get_file_description($style_file) );
                 $style_show = basename($style_file);
@@ -238 +224 @@
 
                 <div>
-                <?php if ( is_child_theme() && ! $is_child_theme && $themes[$theme]['Template'] == get_option('template') ) : ?>
-                        <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
-                        <?php _e( 'This is a file in your current parent theme.' ); ?></p>
-                <?php endif; ?>
-<?php
-        if ( is_writeable( $file ) ) :
-                submit_button( __( 'Update File' ), 'primary', 'submit', true, array( 'tabindex' => '2' ) );
-        else : ?>
+<?php if ( is_writeable($file) ) : ?>
+                        <p class="submit">
+<?php
+        echo "<input type='submit' name='submit' class='button-primary' value='" . esc_attr__('Update File') . "' tabindex='2' />";
+?>
+</p>
+<?php else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
@@ -269 +254 @@
 }
 
-include(ABSPATH . "wp-admin/admin-footer.php");
+include("./admin-footer.php");