Changeset 38750

Timestamp:

10/07/2016 07:38:03 PM (8 years ago)

Author:

ocean90

Message:

Taxonomy: Don't drop term order and current page when bulk deleting terms.

• Removes special handling for edit-tags.php which is no longer required because of term.php. Related: [34202] and [36308].
• Sets $referer to $_SERVER['REQUEST_URI'] because wp_get_referer() returns false if $_SERVER['REQUEST_URI'] === $_REQUEST['_wp_http_referer'].
• Sets paged always to $pagenum which is the value of $wp_list_table->get_pagenum();. This avoids an additional redirect when you delete an item which was previously on the last page.

Fixes #38194.

File:

• trunk/src/wp-admin/edit-tags.php (modified) (6 diffs)

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

@@ -62 +62 @@
 $location = false;
 $referer = wp_get_referer();
+if ( ! $referer ) { // For POST requests.
+    $referer = wp_unslash( $_SERVER['REQUEST_URI'] );
+}
+$referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message' ), $referer );
 
 switch ( $wp_list_table->current_action() ) {
 
 case 'add-tag':
-
     check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
@@ -78 +81 @@
 
     $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
-    if ( 'post' != $post_type )
-        $location .= '&post_type=' . $post_type;
-
-    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
-        $location = $referer;
-    }
-
     if ( $ret && !is_wp_error( $ret ) )
         $location = add_query_arg( 'message', 1, $location );
     else
-        $location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
+        $location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
 
     break;
 
 case 'delete':
-    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
-    if ( 'post' != $post_type )
-        $location .= '&post_type=' . $post_type;
-
-    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
-        $location = $referer;
-    }
-
     if ( ! isset( $_REQUEST['tag_ID'] ) ) {
         break;
@@ -119 +106 @@
     wp_delete_term( $tag_ID, $taxonomy );
 
-    $location = add_query_arg( 'message', 2, $location );
+    $location = add_query_arg( 'message', 2, $referer );
 
     break;
@@ -139 +126 @@
     }
 
-    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
-    if ( 'post' != $post_type )
-        $location .= '&post_type=' . $post_type;
-    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
-        $location = $referer;
-    }
-
-    $location = add_query_arg( 'message', 6, $location );
+    $location = add_query_arg( 'message', 6, $referer );
 
     break;
@@ -183 +163 @@
     $ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
-    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
-    if ( 'post' != $post_type )
-        $location .= '&post_type=' . $post_type;
-
-    if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
-        $location = $referer;
-    }
-
-    if ( $ret && !is_wp_error( $ret ) )
-        $location = add_query_arg( 'message', 3, $location );
-    else
-        $location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
+    if ( $ret && ! is_wp_error( $ret ) ) {
+        $location = add_query_arg( 'message', 3, $referer );
+    } else {
+        $location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
+    }
     break;
 default:
@@ -219 +192 @@
 
 if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-    $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) );
+    $location = remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) );
 }
 
 if ( $location ) {
-    if ( ! empty( $_REQUEST['paged'] ) ) {
-        $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
-    }
+    $location = add_query_arg( 'paged', $pagenum, $location ); // $pagenum takes care of $total_pages.
 
     /**