Changeset 34202

Timestamp:

09/15/2015 03:58:04 PM (9 years ago)

Author:

wonderboymusic

Message:

Don't redirect to the Term list table after submitting the form on the Edit Term page.

Props chiragswadia, UmeshSingla, rhyswynne, afercia.
Fixes #17455.

Location:

trunk/src/wp-admin

Files:

• edit-tag-form.php (modified) (2 diffs)
• edit-tags.php (modified) (6 diffs)
• includes/class-wp-terms-list-table.php (modified) (2 diffs)
• includes/edit-tag-messages.php (added)

trunk/src/wp-admin/edit-tag-form.php

@@ -49 +49 @@
     do_action( 'edit_tag_form_pre', $tag );
 }
+
+/**
+ * Use with caution, see http://codex.wordpress.org/Function_Reference/wp_reset_vars
+ */
+wp_reset_vars( array( 'wp_http_referer' ) );
+
+$wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
+
+/** Also used by Edit Tags */
+require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+
 /**
  * Fires before the Edit Term form for all taxonomies.
@@ -64 +75 @@
 <div class="wrap">
 <h1><?php echo $tax->labels->edit_item; ?></h1>
+
+<?php if ( $message ) : ?>
+<div id="message" class="updated">
+    <p><strong><?php echo $message; ?></strong></p>
+    <?php if ( $wp_http_referer ) { ?>
+    <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php printf( __( '&larr; Back to %s' ), $tax->labels->name ); ?></a></p>
+    <?php } else { ?>
+    <p><a href="<?php echo esc_url( wp_get_referer() ); ?>"><?php printf( __( '&larr; Back to %s' ), $tax->labels->name ); ?></a></p>
+    <?php } ?>
+</div>
+<?php endif; ?>
+
 <div id="ajax-response"></div>
+
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"
 <?php

trunk/src/wp-admin/edit-tags.php

@@ -52 +52 @@
 
 $location = false;
+$referer = wp_get_referer();
 
 switch ( $wp_list_table->current_action() ) {
@@ -72 +73 @@
         $location .= '&post_type=' . $post_type;
 
-    if ( $referer = wp_get_original_referer() ) {
-        if ( false !== strpos( $referer, 'edit-tags.php' ) )
-            $location = $referer;
+    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+        $location = $referer;
     }
 
@@ -88 +88 @@
     if ( 'post' != $post_type )
         $location .= '&post_type=' . $post_type;
-    if ( $referer = wp_get_referer() ) {
-        if ( false !== strpos( $referer, 'edit-tags.php' ) )
-            $location = $referer;
+
+    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+        $location = $referer;
     }
 
@@ -133 +133 @@
     if ( 'post' != $post_type )
         $location .= '&post_type=' . $post_type;
-    if ( $referer = wp_get_referer() ) {
-        if ( false !== strpos( $referer, 'edit-tags.php' ) )
-            $location = $referer;
+    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+        $location = $referer;
     }
 
@@ -178 +177 @@
         $location .= '&post_type=' . $post_type;
 
-    if ( $referer = wp_get_original_referer() ) {
-        if ( false !== strpos( $referer, 'edit-tags.php' ) )
-            $location = $referer;
+    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+        $location = $referer;
     }
 
@@ -286 +284 @@
 }
 
-$messages = array();
-$messages['_item'] = array(
-    0 => '', // Unused. Messages start at index 1.
-    1 => __( 'Item added.' ),
-    2 => __( 'Item deleted.' ),
-    3 => __( 'Item updated.' ),
-    4 => __( 'Item not added.' ),
-    5 => __( 'Item not updated.' ),
-    6 => __( 'Items deleted.' )
-);
-$messages['category'] = array(
-    0 => '', // Unused. Messages start at index 1.
-    1 => __( 'Category added.' ),
-    2 => __( 'Category deleted.' ),
-    3 => __( 'Category updated.' ),
-    4 => __( 'Category not added.' ),
-    5 => __( 'Category not updated.' ),
-    6 => __( 'Categories deleted.' )
-);
-$messages['post_tag'] = array(
-    0 => '', // Unused. Messages start at index 1.
-    1 => __( 'Tag added.' ),
-    2 => __( 'Tag deleted.' ),
-    3 => __( 'Tag updated.' ),
-    4 => __( 'Tag not added.' ),
-    5 => __( 'Tag not updated.' ),
-    6 => __( 'Tags deleted.' )
-);
-
-/**
- * Filter the messages displayed when a tag is updated.
- *
- * @since 3.7.0
- *
- * @param array $messages The messages to be displayed.
- */
-$messages = apply_filters( 'term_updated_messages', $messages );
-
-$message = false;
-if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
-    if ( isset( $messages[ $taxonomy ][ $msg ] ) )
-        $message = $messages[ $taxonomy ][ $msg ];
-    elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) )
-        $message = $messages['_item'][ $msg ];
-}
+/** Also used by the Edit Tag  form */
+require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
 
 $class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -360 +360 @@
 
         $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
-        $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
-
-        $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
+
+        $uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+        $edit_link = add_query_arg(
+            'wp_http_referer',
+            urlencode( wp_unslash( $uri ) ),
+            get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+        );
+
+        $out = '<strong><a class="row-title" href="' . esc_url( $edit_link ) . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
 
         $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
@@ -406 +413 @@
         $default_term = get_option( 'default_' . $taxonomy );
 
-        $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
+        $uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+        $edit_link = add_query_arg(
+            'wp_http_referer',
+            urlencode( wp_unslash( $uri ) ),
+            get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+        );
 
         $actions = array();
         if ( current_user_can( $tax->cap->edit_terms ) ) {
-            $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+            $actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit' ) . '</a>';
             $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
         }