Changeset 13213

Timestamp:

02/19/2010 09:54:18 AM (15 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

Location:

trunk

Files:

• wp-admin/edit-tags.php (modified) (4 diffs)
• wp-admin/includes/template.php (modified) (4 diffs)
• wp-includes/link-template.php (modified) (1 diff)

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') )

trunk/wp-admin/includes/template.php

@@ -453 +453 @@
  */
 function _tag_row( $tag, $level, $taxonomy = 'post_tag' ) {
+        global $post_type;
         static $row_class = '';
         $row_class = ($row_class == '' ? ' class="alternate"' : '');
 
         $count = number_format_i18n( $tag->count );
-        if ( 'post_tag' == $taxonomy )
+        $tax = get_taxonomy($taxonomy);
+
+        if ( 'post_tag' == $taxonomy ) {
             $tagsel = 'tag';
-        elseif ( 'category' == $taxonomy )
+        } elseif ( 'category' == $taxonomy ) {
             $tagsel = 'category_name';
-        else
+        } elseif ( ! empty($tax->query_var) ) {
+            $tagsel = $tax->query_var;
+        } else {
             $tagsel = $taxonomy;
-
-        $tax = get_taxonomy($taxonomy);
-
-        $count = ( $count > 0 ) ? "<a href='edit.php?$tagsel=$tag->slug'>$count</a>" : $count;
+        }
+
+        $count = ( $count > 0 ) ? "<a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a>" : $count;
 
         $pad = str_repeat( '&#8212; ', max(0, $level) );
         $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
         $qe_data = get_term($tag->term_id, $taxonomy, object, 'edit');
-        $edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id";
+        $edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;post_type=$post_type&amp;tag_ID=$tag->term_id";
 
         $out = '';
@@ -587 +591 @@
         foreach( $terms as $term )
             $out .= _tag_row( $term, 0, $taxonomy );
+        $count = $pagesize; // Only displaying a single page.
     }
 
@@ -3284 +3289 @@
                 <label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
                 <input type="text" id="find-posts-input" name="ps" value="" />
-                <input type="button" onClick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
+                <input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
                 <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
@@ -3294 +3299 @@
         </div>
         <div class="find-box-buttons">
-            <input type="button" class="button alignleft" onClick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
+            <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
             <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
         </div>

trunk/wp-includes/link-template.php

@@ -620 +620 @@
  */
 function get_edit_tag_link( $tag_id = 0, $taxonomy = 'post_tag' ) {
+    global $post_type;
     $tax = get_taxonomy($taxonomy);
     if ( !current_user_can($tax->edit_cap) )
         return;
-    
+
     $tag = get_term($tag_id, $taxonomy);
 
-    $location = admin_url('edit-tags.php?action=edit&taxonomy=' . $taxonomy . '&tag_ID=' . $tag->term_id);
+    $location = admin_url('edit-tags.php?action=edit&taxonomy=' . $taxonomy . '&' . (!empty($post_type) ? 'post_type=' . $post_type .'&' : '') .'tag_ID=' . $tag->term_id);
     return apply_filters( 'get_edit_tag_link', $location );
 }