Ticket #26758: 26758.2.patch

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

@@ -48 +48 @@
          */
         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 );
+
+$messages = array();
+// 0 = unused. Messages start at index 1.
+$messages['_item'] = array(
+        0 => '',
+        1 => __( 'Item added.' ),
+        2 => __( 'Item deleted.' ),
+        3 => __( 'Item updated.' ),
+        4 => __( 'Item not added.' ),
+        5 => __( 'Item not updated.' ),
+        6 => __( 'Items deleted.' ),
+);
+$messages['category'] = array(
+        0 => '',
+        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 => '',
+        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 4.1.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 ];
+        }
+}
+
+
+/**
  * Fires before the Edit Term form for all taxonomies.
  *
  * The dynamic portion of the hook name, `$taxonomy`, refers to
@@ -63 +121 @@
 
 <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
 /**

src/wp-admin/edit-tags.php

@@ -71 +71 @@
         if ( 'post' != $post_type )
                 $location .= '&post_type=' . $post_type;
 
-        if ( $referer = wp_get_original_referer() ) {
+        if ( $referer = wp_get_referer() ) {
                 if ( false !== strpos( $referer, 'edit-tags.php' ) )
                         $location = $referer;
         }
@@ -177 +177 @@
         if ( 'post' != $post_type )
                 $location .= '&post_type=' . $post_type;
 
-        if ( $referer = wp_get_original_referer() ) {
+        if ( $referer = wp_get_referer() ) {
                 if ( false !== strpos( $referer, 'edit-tags.php' ) )
                         $location = $referer;
         }

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

@@ -359 +359 @@
                 $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
 
                 $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 ) );
 
+                $doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+
+                $uri = $doing_ajax ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+                $edit_link = esc_url( 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="' . $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 . '">';
@@ -405 +410 @@
                 $tax = get_taxonomy( $taxonomy );
                 $default_term = get_option( 'default_' . $taxonomy );
 
-                $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
+                $doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
 
+                $uri = $doing_ajax ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+                $edit_link = esc_url( 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>';