Ticket #42100: 42100.2.diff

src/wp-admin/css/edit.css

@@ -529 +529 @@
         margin: 25px;
 }
 
-#post-lock-dialog .post-locked-message a.button {
+#post-lock-dialog .post-locked-message a.button,
+#file-editor-warning .button {
         margin-right: 10px;
 }
 

src/wp-admin/js/theme-plugin-editor.js

@@ -52 +52 @@
 
                 if ( component.warning.length > 0 ) {
                         $( 'body' ).addClass( 'modal-open' );
-                        component.warning.find( '.file-editor-warning-dismiss' ).focus();
+                        component.warning.find( '.file-editor-warning-go-back' ).focus();
                         component.warning.on( 'click', '.file-editor-warning-dismiss', component.dismissWarning );
                 }
 

src/wp-admin/plugin-editor.php

@@ -285 +285 @@
 <?php
 $dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
 if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :
+        // Get a back URL
+        $referer = wp_get_referer();
+        $excluded_referer_basenames = array( 'plugin-editor.php', 'wp-login.php' );
+
+        if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+                $return_url = $referer;
+        } else {
+                $return_url = admin_url( '/' );
+        }
 ?>
 <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js">
         <div class="notification-dialog-background"></div>
@@ -293 +302 @@
                         <h1 id="file-editor-warning-title"><?php _e( 'Heads up!' ); ?></h1>
                         <p><?php _e( 'You appear to be making direct edits to your plugin in the WordPress dashboard. We recommend that you don&#8217;t! Editing plugins directly may introduce incompatibilities that break your theme or other plugins, and can leave you unable to log back in to WordPress and undo changes.' ); ?></p>
                         <p><?php _e( 'If you absolutely have to edit this plugin, create a copy with a new name and hang on to the original version, so you can re-enable a functional version if something goes wrong.' ); ?></p>
-                        <p><button type="button" class="file-editor-warning-dismiss button-primary"><?php _e( 'I understand' ); ?></button></p>
+                        <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>

src/wp-admin/theme-editor.php

@@ -290 +290 @@
 <?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();
+        $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 ) ) {
+                $return_url = $referer;
+        } else {
+                $return_url = admin_url( '/' );
+        }
 ?>
 <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js">
         <div class="notification-dialog-background"></div>
@@ -300 +309 @@
                                 <?php
                                 echo sprintf(
                                         /* translators: %s is a link to Custom CSS section in the Customizer. */
-                                        __( 'You appear to be making direct edits to your theme in the WordPress Dashboard. We recommend that you don&#8217;t! Editing this code directly is dangerous, and can leave you unable to log back in to WordPress and undo changes. There&#8217;s no need to change your CSS here &mdash; you can edit and live preview CSS changes in WordPress&#8217;s <a href="%s">built in CSS editor</a>.' ),
+                                        __( 'You appear to be making direct edits to your theme in the WordPress dashboard. We recommend that you don&#8217;t! Editing this code directly is dangerous, and can leave you unable to log back in to WordPress and undo changes. There&#8217;s no need to change your CSS here &mdash; you can edit and live preview CSS changes in WordPress&#8217;s <a href="%s">built in CSS editor</a>.' ),
                                         esc_url( add_query_arg( 'autofocus[section]', 'custom_css', admin_url( 'customize.php' ) ) )
                                 );
                                 ?>
                         </p>
                         <p><?php _e( 'If you decide to go ahead with direct edits anyway, make sure to back up all your site&#8217;s files before making changes so you can restore a functional version if something goes wrong.' ); ?></p>
-                        <p><button type="button" class="file-editor-warning-dismiss button-primary"><?php _e( 'I understand' ); ?></button></p>
+                        <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>