--- a/wp/wp-admin/theme-editor.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/theme-editor.php Tue Dec 15 13:49:49 2020 +0100
@@ -7,11 +7,11 @@
*/
/** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';
if ( is_multisite() && ! is_network_admin() ) {
wp_redirect( network_admin_url( 'theme-editor.php' ) );
- exit();
+ exit;
}
if ( ! current_user_can( 'edit_themes' ) ) {
@@ -38,7 +38,7 @@
'<p>' . __( 'After typing in your edits, click Update File.' ) . '</p>' .
'<p>' . __( '<strong>Advice:</strong> Think very carefully about your site crashing if you are live-editing the theme currently in use.' ) . '</p>' .
'<p>' . sprintf(
- /* translators: %s: link to documentation on child themes */
+ /* translators: %s: Link to documentation on child themes. */
__( 'Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.' ),
__( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' )
) . '</p>' .
@@ -48,10 +48,10 @@
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
- '<p>' . __( '<a href="https://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://developer.wordpress.org/themes/">Documentation on Theme Development</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/article/using-themes/">Documentation on Using Themes</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/article/editing-files/">Documentation on Editing Files</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://developer.wordpress.org/themes/basics/template-tags/">Documentation on Template Tags</a>' ) . '</p>' .
'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
);
@@ -69,12 +69,12 @@
wp_die( __( 'The requested theme does not exist.' ) );
}
-if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) {
+if ( $theme->errors() && 'theme_no_stylesheet' === $theme->errors()->get_error_code() ) {
wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
}
-$allowed_files = $style_files = array();
-$has_templates = false;
+$allowed_files = array();
+$style_files = array();
$file_types = wp_get_theme_file_editable_extensions( $theme );
@@ -82,7 +82,6 @@
switch ( $type ) {
case 'php':
$allowed_files += $theme->get_files( 'php', -1 );
- $has_templates = ! empty( $allowed_files );
break;
case 'css':
$style_files = $theme->get_files( 'css', -1 );
@@ -116,6 +115,7 @@
// Handle fallback editing of file when JavaScript is not available.
$edit_error = null;
$posted_content = null;
+
if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
$r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
if ( is_wp_error( $r ) ) {
@@ -138,49 +138,49 @@
}
}
- $settings = array(
- 'codeEditor' => wp_enqueue_code_editor( compact( 'file' ) ),
- );
- wp_enqueue_script( 'wp-theme-plugin-editor' );
- wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );
- wp_add_inline_script( 'wp-theme-plugin-editor', 'wp.themePluginEditor.themeOrPlugin = "theme";' );
+$settings = array(
+ 'codeEditor' => wp_enqueue_code_editor( compact( 'file' ) ),
+);
+wp_enqueue_script( 'wp-theme-plugin-editor' );
+wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );
+wp_add_inline_script( 'wp-theme-plugin-editor', 'wp.themePluginEditor.themeOrPlugin = "theme";' );
+
+require_once ABSPATH . 'wp-admin/admin-header.php';
+
+update_recently_edited( $file );
+
+if ( ! is_file( $file ) ) {
+ $error = true;
+}
- require_once( ABSPATH . 'wp-admin/admin-header.php' );
+$content = '';
+if ( ! empty( $posted_content ) ) {
+ $content = $posted_content;
+} elseif ( ! $error && filesize( $file ) > 0 ) {
+ $f = fopen( $file, 'r' );
+ $content = fread( $f, filesize( $file ) );
- update_recently_edited( $file );
+ if ( '.php' === substr( $file, strrpos( $file, '.' ) ) ) {
+ $functions = wp_doc_link_parse( $content );
- if ( ! is_file( $file ) ) {
- $error = true;
+ $docs_select = '<select name="docs-list" id="docs-list">';
+ $docs_select .= '<option value="">' . esc_attr__( 'Function Name…' ) . '</option>';
+ foreach ( $functions as $function ) {
+ $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+ }
+ $docs_select .= '</select>';
}
- $content = '';
- if ( ! empty( $posted_content ) ) {
- $content = $posted_content;
- } elseif ( ! $error && filesize( $file ) > 0 ) {
- $f = fopen( $file, 'r' );
- $content = fread( $f, filesize( $file ) );
-
- if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
- $functions = wp_doc_link_parse( $content );
+ $content = esc_textarea( $content );
+}
- $docs_select = '<select name="docs-list" id="docs-list">';
- $docs_select .= '<option value="">' . esc_attr__( 'Function Name…' ) . '</option>';
- foreach ( $functions as $function ) {
- $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
- }
- $docs_select .= '</select>';
- }
-
- $content = esc_textarea( $content );
- }
-
- $file_description = get_file_description( $relative_file );
- $file_show = array_search( $file, array_filter( $allowed_files ) );
- $description = esc_html( $file_description );
- if ( $file_description != $file_show ) {
- $description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
- }
- ?>
+$file_description = get_file_description( $relative_file );
+$file_show = array_search( $file, array_filter( $allowed_files ), true );
+$description = esc_html( $file_description );
+if ( $file_description !== $file_show ) {
+ $description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
+}
+?>
<div class="wrap">
<h1><?php echo esc_html( $title ); ?></h1>
@@ -194,13 +194,14 @@
<pre><?php echo esc_html( $edit_error->get_error_message() ? $edit_error->get_error_message() : $edit_error->get_error_code() ); ?></pre>
</div>
<?php endif; ?>
+
<?php if ( preg_match( '/\.css$/', $file ) ) : ?>
<div id="message" class="notice-info notice">
<p><strong><?php _e( 'Did you know?' ); ?></strong></p>
<p>
<?php
- echo sprintf(
- /* translators: %s: link to Custom CSS section in the Customizer */
+ printf(
+ /* translators: %s: Link to Custom CSS section in the Customizer. */
__( 'There’s no need to change your CSS here — you can edit and live preview CSS changes in the <a href="%s">built-in CSS editor</a>.' ),
esc_url( add_query_arg( 'autofocus[section]', 'custom_css', admin_url( 'customize.php' ) ) )
);
@@ -212,46 +213,48 @@
<div class="fileedit-sub">
<div class="alignleft">
<h2>
-<?php
-echo $theme->display( 'Name' );
-if ( $description ) {
- echo ': ' . $description;}
-?>
+ <?php
+ echo $theme->display( 'Name' );
+ if ( $description ) {
+ echo ': ' . $description;}
+ ?>
</h2>
</div>
<div class="alignright">
<form action="theme-editor.php" method="get">
<strong><label for="theme"><?php _e( 'Select theme to edit:' ); ?> </label></strong>
<select name="theme" id="theme">
-<?php
-foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
- if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) {
- continue;
- }
+ <?php
+ foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
+ if ( $a_theme->errors() && 'theme_no_stylesheet' === $a_theme->errors()->get_error_code() ) {
+ continue;
+ }
- $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
- echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display( 'Name' ) . '</option>';
-}
-?>
+ $selected = ( $a_stylesheet === $stylesheet ) ? ' selected="selected"' : '';
+ echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display( 'Name' ) . '</option>';
+ }
+ ?>
</select>
<?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
</form>
</div>
<br class="clear" />
</div>
+
<?php
if ( $theme->errors() ) {
echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
}
?>
+
<div id="templateside">
<h2 id="theme-files-label"><?php _e( 'Theme Files' ); ?></h2>
<ul role="tree" aria-labelledby="theme-files-label">
- <?php if ( ( $has_templates || $theme->parent() ) && $theme->parent() ) : ?>
+ <?php if ( $theme->parent() ) : ?>
<li class="howto">
<?php
- /* translators: %s: link to edit parent theme */
- echo sprintf(
+ printf(
+ /* translators: %s: Link to edit parent theme. */
__( 'This child theme inherits templates from a parent theme, %s.' ),
sprintf(
'<a href="%s">%s</a>',
@@ -272,7 +275,7 @@
<?php
if ( $error ) :
- echo '<div class="error"><p>' . __( 'Oops, no such file exists! Double check the name and try again, merci.' ) . '</p></div>';
+ echo '<div class="error"><p>' . __( 'File does not exist! Please double check the name and try again.' ) . '</p></div>';
else :
?>
<form name="template" id="template" action="theme-editor.php" method="post">
@@ -284,49 +287,59 @@
<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() ); ?>" />
</div>
- <?php if ( ! empty( $functions ) ) : ?>
- <div id="documentation" class="hide-if-no-js">
- <label for="docs-list"><?php _e( 'Documentation:' ); ?></label>
- <?php echo $docs_select; ?>
- <input disabled id="docs-lookup" type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_user_locale() ); ?>&version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&redirect=true'); }" />
- </div>
- <?php endif; ?>
+
+ <?php if ( ! empty( $functions ) ) : ?>
+ <div id="documentation" class="hide-if-no-js">
+ <label for="docs-list"><?php _e( 'Documentation:' ); ?></label>
+ <?php echo $docs_select; ?>
+ <input disabled id="docs-lookup" type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_user_locale() ); ?>&version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&redirect=true'); }" />
+ </div>
+ <?php endif; ?>
- <div>
- <div class="editor-notices">
- <?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
- <div class="notice notice-warning inline">
- <p>
- <?php
- if ( is_writeable( $file ) ) {
- ?>
- <strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
- <?php _e( 'This is a file in your current parent theme.' ); ?>
- </p>
- </div>
+ <div>
+ <div class="editor-notices">
+ <?php if ( is_child_theme() && $theme->get_stylesheet() === get_template() ) : ?>
+ <div class="notice notice-warning inline">
+ <p>
+ <?php if ( is_writeable( $file ) ) : ?>
+ <strong><?php _e( 'Caution:' ); ?></strong>
+ <?php endif; ?>
+ <?php _e( 'This is a file in your current parent theme.' ); ?>
+ </p>
+ </div>
+ <?php endif; ?>
+ </div>
+ <?php if ( is_writeable( $file ) ) : ?>
+ <p class="submit">
+ <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>
+ <span class="spinner"></span>
+ </p>
+ <?php else : ?>
+ <p><em>
+ <?php
+ printf(
+ /* translators: %s: Documentation URL. */
+ __( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),
+ __( 'https://wordpress.org/support/article/changing-file-permissions/' )
+ );
+ ?>
+ </em></p>
<?php endif; ?>
</div>
- <?php if ( is_writeable( $file ) ) : ?>
- <p class="submit">
- <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>
- <span class="spinner"></span>
- </p>
- <?php else : ?>
- <p><em><?php _e( 'You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.' ); ?></em></p>
- <?php endif; ?>
- </div>
- <?php wp_print_file_editor_templates(); ?>
+
+ <?php wp_print_file_editor_templates(); ?>
</form>
<?php
-endif; // $error
+endif; // End if $error.
?>
<br class="clear" />
</div>
<?php
$dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
- // Get a back URL
- $referer = wp_get_referer();
+ // Get a back URL.
+ $referer = wp_get_referer();
+
$excluded_referer_basenames = array( 'theme-editor.php', 'wp-login.php' );
if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
@@ -335,31 +348,38 @@
$return_url = admin_url( '/' );
}
?>
-<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
- <div class="notification-dialog-background"></div>
- <div class="notification-dialog">
- <div class="file-editor-warning-content">
- <div class="file-editor-warning-message">
- <h1><?php _e( 'Heads up!' ); ?></h1>
+ <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
+ <div class="notification-dialog-background"></div>
+ <div class="notification-dialog">
+ <div class="file-editor-warning-content">
+ <div class="file-editor-warning-message">
+ <h1><?php _e( 'Heads up!' ); ?></h1>
+ <p>
+ <?php
+ _e( 'You appear to be making direct edits to your theme in the WordPress dashboard. We recommend that you don’t! Editing your theme directly could break your site and your changes may be lost in future updates.' );
+ ?>
+ </p>
+ <?php
+ if ( ! $theme->parent() ) {
+ echo '<p>';
+ printf(
+ /* translators: %s: Link to documentation on child themes. */
+ __( 'If you need to tweak more than your theme’s CSS, you might want to try <a href="%s">making a child theme</a>.' ),
+ esc_url( __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ) )
+ );
+ echo '</p>';
+ }
+ ?>
+ <p><?php _e( 'If you decide to go ahead with direct edits anyway, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>
+ </div>
<p>
- <?php
- echo sprintf(
- /* translators: %s: link to documentation on child themes */
- __( 'You appear to be making direct edits to your theme in the WordPress dashboard. We recommend that you don’t! Editing your theme directly could break your site and your changes may be lost in future updates. If you need to tweak more than your theme’s CSS, you might want to try <a href="%s">making a child theme</a>.' ),
- esc_url( __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ) )
- );
- ?>
+ <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>
+ <button type="button" class="file-editor-warning-dismiss button button-primary"><?php _e( 'I understand' ); ?></button>
</p>
- <p><?php _e( 'If you decide to go ahead with direct edits anyway, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>
</div>
- <p>
- <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>
- <button type="button" class="file-editor-warning-dismiss button button-primary"><?php _e( 'I understand' ); ?></button>
- </p>
</div>
</div>
-</div>
<?php
-endif; // editor warning notice
+endif; // Editor warning notice.
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once ABSPATH . 'wp-admin/admin-footer.php';