Changeset 13213 for trunk/wp-admin/includes/template.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/includes/template.php (modified) (4 diffs)

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>