Changeset 13213 for trunk/wp-admin/edit-tags.php

Timestamp:

02/19/2010 09:54:18 AM (16 years ago)

Author:

dd32

Message:

Fix $post_type handling/passing in the Taxonomy edit links. Fix the Tag selection query var for edit.php in the Posts links. See #12270, See #11838

File:

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

trunk/wp-admin/edit-tags.php

@@ -46 +46 @@
 
     $ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
-    if ( $ret && !is_wp_error( $ret ) ) {
-        wp_redirect("edit-tags.php?taxonomy=$taxonomy&message=1#addtag");
-    } else {
-        wp_redirect("edit-tags.php?taxonomy=$taxonomy&message=4#addtag");
-    }
+    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
+    if ( 'post' != $post_type )
+        $location .= '&post_type=' . $post_type;
+
+    if ( $referer = wp_get_original_referer() ) {
+        if ( 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('message', 4, $location);
     exit;
 break;
 
 case 'delete':
-    if ( !isset( $_GET['tag_ID'] ) ) {
-        wp_redirect("edit-tags.php?taxonomy=$taxonomy");
-        exit;
-    }
-
-    $tag_ID = (int) $_GET['tag_ID'];
-    check_admin_referer('delete-tag_' .  $tag_ID);
-
-    if ( !current_user_can($tax->delete_cap) )
-        wp_die(__('Cheatin’ uh?'));
-
-    wp_delete_term( $tag_ID, $taxonomy);
-
     $location = 'edit-tags.php?taxonomy=' . $taxonomy;
+    if ( 'post' != $post_type )
+        $location .= '&post_type=' . $post_type;
     if ( $referer = wp_get_referer() ) {
         if ( false !== strpos($referer, 'edit-tags.php') )
@@ -74 +71 @@
     }
 
+    if ( !isset( $_GET['tag_ID'] ) ) {
+        wp_redirect($location);
+        exit;
+    }
+
+    $tag_ID = (int) $_GET['tag_ID'];
+    check_admin_referer('delete-tag_' .  $tag_ID);
+
+    if ( !current_user_can($tax->delete_cap) )
+        wp_die(__('Cheatin’ uh?'));
+
+    wp_delete_term( $tag_ID, $taxonomy);
+
     $location = add_query_arg('message', 2, $location);
     wp_redirect($location);
@@ -92 +102 @@
 
     $location = 'edit-tags.php?taxonomy=' . $taxonomy;
+    if ( 'post' != $post_type )
+        $location .= '&post_type=' . $post_type;
     if ( $referer = wp_get_referer() ) {
         if ( false !== strpos($referer, 'edit-tags.php') )
@@ -124 +136 @@
 
     $location = 'edit-tags.php?taxonomy=' . $taxonomy;
+    if ( 'post' != $post_type )
+        $location .= '&post_type=' . $post_type;
+
     if ( $referer = wp_get_original_referer() ) {
         if ( false !== strpos($referer, 'edit-tags.php') )