WordPress 4.3-scripts

[autoinstalls/wordpress.git] / wp-admin / theme-editor.php

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 8f95cab11f23fbf66299044f61b34858f7bd91ff..c858c0bbcf4d13b46b10efd39cd2efa271d19dae 100644 (file)
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( is_multisite() && ! is_network_admin() ) {
        wp_redirect( network_admin_url( 'theme-editor.php' ) );
 
 if ( is_multisite() && ! is_network_admin() ) {
        wp_redirect( network_admin_url( 'theme-editor.php' ) );


@@ -27,20 +27,20 @@ get_current_screen()->add_help_tab( array(
        '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
        <p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '</p>
        <p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>
        '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
        <p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '</p>
        <p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>

-       <p id="newcontent-description">' . __('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key.') . '</p>
+       <p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>

        <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>' . __('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>' . __('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>' .
+       <p>' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s" target="_blank">child theme</a> instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '</p>' .

        ( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
 ) );
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        ( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
 ) );
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __('<a href="http://codex.wordpress.org/Theme_Development" target="_blank">Documentation on Theme Development</a>') . '</p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Editing_Files" target="_blank">Documentation on Editing Files</a>') . '</p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Template_Tags" target="_blank">Documentation on Template Tags</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Theme_Development" target="_blank">Documentation on Theme Development</a>') . '</p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Editing_Files" target="_blank">Documentation on Editing Files</a>') . '</p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Template_Tags" target="_blank">Documentation on Template Tags</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'

 );
 
 wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
 );
 
 wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );


@@ -81,7 +81,7 @@ case 'update':
        $newcontent = wp_unslash( $_POST['newcontent'] );
        $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
        if ( is_writeable( $file ) ) {
        $newcontent = wp_unslash( $_POST['newcontent'] );
        $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
        if ( is_writeable( $file ) ) {

-               //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
+               // 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 );
                $f = fopen( $file, 'w+' );
                if ( $f !== false ) {
                        fwrite( $f, $newcontent );


@@ -92,7 +92,6 @@ case 'update':
        }
        wp_redirect( $location );
        exit;
        }
        wp_redirect( $location );
        exit;

-break;

 
 default:
 
 
 default:
 


@@ -122,9 +121,8 @@ default:
                $content = esc_textarea( $content );
        }
 
                $content = esc_textarea( $content );
        }
 

-       ?>
-<?php if ( isset( $_GET['updated'] ) ) : ?>
- <div id="message" class="updated"><p><?php _e( 'File edited successfully.' ) ?></p></div>
+       if ( isset( $_GET['updated'] ) ) : ?>
+ <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>

 <?php endif;
 
 $description = get_file_description( $file );
 <?php endif;
 
 $description = get_file_description( $file );


@@ -133,8 +131,7 @@ if ( $description != $file_show )
        $description .= ' <span>(' . $file_show . ')</span>';
 ?>
 <div class="wrap">
        $description .= ' <span>(' . $file_show . ')</span>';
 ?>
 <div class="wrap">

-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>

 
 <div class="fileedit-sub">
 <div class="alignleft">
 
 <div class="fileedit-sub">
 <div class="alignleft">


@@ -222,7 +219,7 @@ else : ?>
        if ( is_writeable( $file ) ) :
                submit_button( __( 'Update File' ), 'primary', 'submit', true );
        else : ?>
        if ( is_writeable( $file ) ) :
                submit_button( __( 'Update File' ), 'primary', 'submit', true );
        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>
+<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>
        </form>
 <?php endif; ?>
                </div>
        </form>


@@ -232,12 +229,10 @@ endif; // $error
 <br class="clear" />
 </div>
 <script type="text/javascript">
 <br class="clear" />
 </div>
 <script type="text/javascript">

-/* <![CDATA[ */

 jQuery(document).ready(function($){
        $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
        $('#newcontent').scrollTop( $('#scrollto').val() );
 });
 jQuery(document).ready(function($){
        $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
        $('#newcontent').scrollTop( $('#scrollto').val() );
 });

-/* ]]> */

 </script>
 <?php
 break;
 </script>
 <?php
 break;