<!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" />
<title>[20313] trunk/wp-admin: Rewrite theme-editor.php to use the new WP_Theme API.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20313">20313</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-29 03:00:38 +0000 (Thu, 29 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite theme-editor.php to use the new WP_Theme API. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.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="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (20312 => 20313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2012-03-29 02:59:48 UTC (rev 20312)
+++ trunk/wp-admin/includes/file.php 2012-03-29 03:00:38 UTC (rev 20313)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return basename( $file );
</del><ins>+ return trim( basename( $file ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (20312 => 20313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2012-03-29 02:59:48 UTC (rev 20312)
+++ trunk/wp-admin/theme-editor.php 2012-03-29 03:00:38 UTC (rev 20313)
</span><span class="lines">@@ -42,80 +42,73 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));
</del><ins>+wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
</ins><span class="cx">
</span><del>-$themes = get_themes();
</del><ins>+if ( $theme )
+ $stylesheet = $theme;
+else
+ $stylesheet = get_stylesheet();
</ins><span class="cx">
</span><del>-if (empty($theme)) {
- $theme = get_current_theme();
</del><ins>+$theme = wp_get_theme( $stylesheet );
+
+if ( ! $theme )
+ wp_die( __( 'The requested theme does not exist.' ) );
+
+$allowed_files = $theme->get_files( 'php', 1 );
+$style_files = $theme->get_files( 'css' );
+if ( isset( $style_files['style.css'] ) ) {
+ $allowed_files['style.css'] = $style_files['style.css'];
+ unset( $style_files['style.css'] );
</ins><span class="cx"> } else {
</span><del>- $theme = stripslashes($theme);
</del><ins>+ $style_files['style.css'] = false;
</ins><span class="cx"> }
</span><ins>+$allowed_files += $style_files;
</ins><span class="cx">
</span><del>-if ( ! isset($themes[$theme]) )
- wp_die(__('The requested theme does not exist.'));
-
-$allowed_files = array_merge( $themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files'] );
-
</del><span class="cx"> if ( empty( $file ) ) {
</span><del>- if ( false !== array_search( $themes[$theme]['Stylesheet Dir'] . '/style.css', $allowed_files ) )
- $file = $themes[$theme]['Stylesheet Dir'] . '/style.css';
- else
- $file = $allowed_files[0];
-} else {
- $file = stripslashes($file);
- if ( 'theme' == $dir ) {
- $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ;
- } else if ( 'style' == $dir) {
- $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ;
</del><ins>+ if ( ! empty( $allowed_files['style.css'] ) ) {
+ $relative_file = 'style.css';
+ $file = $allowed_files['style.css'];
+ } else {
+ $relative_file = key( $allowed_files );
+ $file = current( $allowed_files );
</ins><span class="cx"> }
</span><ins>+} else {
+ $relative_file = stripslashes( $file );
+ $file = $theme->get_stylesheet_directory() . '/' . $relative_file;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-validate_file_to_edit($file, $allowed_files);
-$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
-$file_show = basename( $file );
</del><ins>+validate_file_to_edit( $file, $allowed_files );
+$scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
</ins><span class="cx">
</span><del>-switch($action) {
-
</del><ins>+switch( $action ) {
</ins><span class="cx"> case 'update':
</span><del>-
- check_admin_referer('edit-theme_' . $file . $theme);
-
- $newcontent = stripslashes($_POST['newcontent']);
- $theme = urlencode($theme);
- if (is_writeable($file)) {
</del><ins>+ check_admin_referer( 'edit-theme_' . $file . $stylesheet );
+ $newcontent = stripslashes( $_POST['newcontent'] );
+ $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
+ if ( is_writeable( $file ) ) {
</ins><span class="cx"> //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
</span><del>- $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";
</del><ins>+ $f = fopen( $file, 'w+' );
+ if ( $f !== false ) {
+ fwrite( $f, $newcontent );
+ fclose( $f );
+ $location .= '&updated=true';
</ins><span class="cx"> }
</span><del>- } else {
- $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
</del><span class="cx"> }
</span><del>-
- $location = wp_kses_no_null($location);
- $strip = array('%0d', '%0a', '%0D', '%0A');
- $location = _deep_replace($strip, $location);
- header("Location: $location");
- exit();
-
</del><ins>+ wp_redirect( $location );
+ exit;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="cx">
</span><del>- require_once(ABSPATH . 'wp-admin/admin-header.php');
</del><ins>+ require_once( ABSPATH . 'wp-admin/admin-header.php' );
</ins><span class="cx">
</span><del>- update_recently_edited($file);
</del><ins>+ update_recently_edited( $file );
</ins><span class="cx">
</span><del>- if ( !is_file($file) )
- $error = 1;
</del><ins>+ if ( ! is_file( $file ) )
+ $error = true;
</ins><span class="cx">
</span><span class="cx"> $content = '';
</span><del>- if ( !$error && filesize($file) > 0 ) {
</del><ins>+ if ( ! $error && filesize( $file ) > 0 ) {
</ins><span class="cx"> $f = fopen($file, 'r');
</span><span class="cx"> $content = fread($f, filesize($file));
</span><span class="cx">
</span><span class="lines">@@ -134,14 +127,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-<?php if (isset($_GET['a'])) : ?>
- <div id="message" class="updated"><p><?php _e('File edited successfully.') ?></p></div>
</del><ins>+<?php if ( isset( $_GET['updated'] ) ) : ?>
+ <div id="message" class="updated"><p><?php _e( 'File edited successfully.' ) ?></p></div>
</ins><span class="cx"> <?php endif;
</span><span class="cx">
</span><del>-$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'];
</del><ins>+$description = get_file_description( $file );
+$file_show = array_search( $file, $allowed_files );
+if ( $description != $file_show )
+ $description .= ' <span>(' . $file_show . ')</span>';
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="lines">@@ -149,19 +142,16 @@
</span><span class="cx">
</span><span class="cx"> <div class="fileedit-sub">
</span><span class="cx"> <div class="alignleft">
</span><del>-<h3><?php echo $themes[$theme]['Name'] . ': ' . $desc_header; ?></h3>
</del><ins>+<h3><?php echo $theme->display('Name') . ': ' . $description; ?></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="cx"> <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
</span><span class="cx"> <select name="theme" id="theme">
</span><span class="cx"> <?php
</span><del>- foreach ($themes as $a_theme) {
- $theme_name = $a_theme['Name'];
- if ($theme_name == $theme) $selected = " selected='selected'";
- else $selected = '';
- $theme_name = esc_attr($theme_name);
- echo "\n\t<option value=\"$theme_name\" $selected>$theme_name</option>";
</del><ins>+foreach ( wp_get_themes() as $a_stylesheet => $a_theme ) {
+ $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
+ echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="lines">@@ -172,76 +162,56 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div id="templateside">
</span><span class="cx"> <?php
</span><del>-if ($allowed_files) :
</del><ins>+if ( $allowed_files ) :
</ins><span class="cx"> ?>
</span><span class="cx"> <h3><?php _e('Templates'); ?></h3>
</span><del>- <?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>
</del><ins>+ <?php if ( $theme->is_child_theme() ) : ?>
+ <p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . $theme->get_template()) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><del>- $template_mapping = array();
- $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;
</del><ins>+ foreach ( $allowed_files as $filename => $absolute_filename ) :
+ if ( 'style.css' == $filename ) {
+ echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
+ if ( ! $absolute_filename )
+ continue;
+ }
</ins><span class="cx">
</span><del>- $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 );
- }
- ksort( $template_mapping );
- while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :
- ?>
- <li><a href="theme-editor.php?file=<?php echo urlencode( $template_file ) ?>&amp;theme=<?php echo urlencode( $theme ) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>
-<?php endwhile; ?>
- </ul>
- <h3><?php /* translators: Theme stylesheets in theme editor */ _ex('Styles', 'Theme stylesheets in theme editor'); ?></h3>
- <ul>
-<?php
- $template_mapping = array();
- $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;
</del><ins>+ $file_description = get_file_description( $filename );
+ if ( $file_description != basename( $filename ) )
+ $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
</ins><span class="cx">
</span><del>- $description = trim( get_file_description($style_file) );
- $style_show = basename($style_file);
- $filedesc = ( $description != $style_file ) ? "$description<br /><span class='nonessential'>($style_show)</span>" : "$description";
- $filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($style_show)</span></span>" : $filedesc;
- $template_mapping[ $description ] = array( _get_template_edit_filename($style_file, $stylesheet_dir), $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 urlencode( $style_file ) ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=style"><?php echo $filedesc ?></a></li>
-<?php endwhile; ?>
- </ul>
</del><ins>+ if ( $absolute_filename == $file )
+ $file_description = '<span class="highlight">' . $file_description . '</span>';
+?>
+ <li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
+<?php
+ endforeach;
+?>
+</ul>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><del>-<?php if (!$error) { ?>
</del><ins>+<?php if ( $error ) :
+ echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
+else : ?>
</ins><span class="cx"> <form name="template" id="template" action="theme-editor.php" method="post">
</span><del>- <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
- <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
</del><ins>+ <?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+ <div><textarea cols="70" rows="30" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
</ins><span class="cx"> <input type="hidden" name="action" value="update" />
</span><del>- <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
- <input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />
</del><ins>+ <input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
+ <input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
</ins><span class="cx"> <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
</span><span class="cx"> </div>
</span><del>- <?php if ( isset($functions ) && count($functions) ) { ?>
</del><ins>+ <?php if ( ! empty( $functions ) ) : ?>
</ins><span class="cx"> <div id="documentation" class="hide-if-no-js">
</span><span class="cx"> <label for="docs-list"><?php _e('Documentation:') ?></label>
</span><span class="cx"> <?php echo $docs_select; ?>
</span><span class="cx"> <input type="button" class="button" value=" <?php esc_attr_e( 'Lookup' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" />
</span><span class="cx"> </div>
</span><del>- <?php } ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <div>
</span><del>- <?php if ( is_child_theme() && ! $is_child_theme && $themes[$theme]['Template'] == get_option('template') ) : ?>
</del><ins>+ <?php if ( is_child_theme() && ! $theme->is_child_theme() && $theme->get_template() == get_template() ) : ?>
</ins><span class="cx"> <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
</span><span class="cx"> <?php _e( 'This is a file in your current parent theme.' ); ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -254,9 +224,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span><del>- } else {
- echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
- }
</del><ins>+endif; // $error
</ins><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span><span class="lines">@@ -272,4 +240,4 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-include(ABSPATH . "wp-admin/admin-footer.php");
</del><ins>+include(ABSPATH . 'wp-admin/admin-footer.php' );
</ins></span></pre>
</div>
</div>
</body>
</html>