Changeset 41859

Timestamp:

10/13/17 20:55:50 (10 days ago)

Author:

helen

Message:

File editor warning: Add a "Go back" button.

see #42100, #31779.

Location:

trunk/src/wp-admin

Files:

• css/edit.css (modified) (1 diff)
• js/theme-plugin-editor.js (modified) (1 diff)
• plugin-editor.php (modified) (2 diffs)
• theme-editor.php (modified) (3 diffs)

trunk/src/wp-admin/css/edit.css

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

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

@@ -53 +53 @@
         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 );
         }

trunk/src/wp-admin/plugin-editor.php

@@ -286 +286 @@
 $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">
@@ -294 +303 @@
             <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>

trunk/src/wp-admin/theme-editor.php

@@ -291 +291 @@
 $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">
@@ -301 +310 @@
                 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' ) ) )
                 );
@@ -307 +316 @@
             </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>