Changeset 29782

Timestamp:

09/29/2014 04:53:07 AM (12 years ago)

Author:

wonderboymusic

Message:

In the form handler logic for edit-tags.php, don't redirect until $_REQUEST['paged'] has been checked. All switch cases (except edit) now use break instead of exit.

Fixes #16162.

File:

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

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

@@ -39 +39 @@
 add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
 
+$location = false;
+
 switch ( $wp_list_table->current_action() ) {
 
@@ -62 +64 @@
         else
                 $location = add_query_arg( 'message', 4, $location );
-        wp_redirect( $location );
-        exit;
+
+        break;
 
 case 'delete':
@@ -74 +76 @@
         }
 
-        if ( !isset( $_REQUEST['tag_ID'] ) ) {
-                wp_redirect( $location );
-                exit;
+        if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+                break;
         }
 
@@ -88 +89 @@
 
         $location = add_query_arg( 'message', 2, $location );
-        wp_redirect( $location );
-        exit;
+
+        break;
 
 case 'bulk-delete':
@@ -111 +112 @@
 
         $location = add_query_arg( 'message', 6, $location );
-        wp_redirect( $location );
-        exit;
+
+        break;
 
 case 'edit':
@@ -124 +125 @@
         require_once( ABSPATH . 'wp-admin/admin-header.php' );
         include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-
-break;
+        include( ABSPATH . 'wp-admin/admin-footer.php' );
+
+        exit;
 
 case 'editedtag':
@@ -153 +155 @@
         else
                 $location = add_query_arg( 'message', 5, $location );
-
-        wp_redirect( $location );
-        exit;
-
-default:
-if ( ! empty($_REQUEST['_wp_http_referer']) ) {
+        break;
+}
+
+if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {
         $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) );
-
-        if ( ! empty( $_REQUEST['paged'] ) )
-                $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );
-
+}
+
+if ( $location ) {
+        if ( ! empty( $_REQUEST['paged'] ) ) {
+                $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+        }
         wp_redirect( $location );
         exit;
@@ -584 +586 @@
 try{document.forms.addtag['tag-name'].focus();}catch(e){}
 </script>
-<?php $wp_list_table->inline_edit(); ?>
-
 <?php
-break;
-}
+$wp_list_table->inline_edit();
 
 include( ABSPATH . 'wp-admin/admin-footer.php' );