Changes in trunk/wp-admin/edit-tags.php [15220:14989]

File:

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

trunk/wp-admin/edit-tags.php

@@ -15 +15 @@
     $taxonomy = 'post_tag';
 
-if ( !taxonomy_exists($taxonomy) )
+if ( !is_taxonomy($taxonomy) )
     wp_die(__('Invalid taxonomy'));
 
@@ -181 +181 @@
         '<li>' . __('<strong>Name</strong> - The name is how it appears on your site.') . '</li>';
     if ( ! global_terms_enabled() )
-        $help .= '<li>' . __('<strong>Slug</strong> - The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.') . '</li>';
+        $help .= '<li>' . __('<strong>Slug</strong> - The  &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.') . '</li>';
 
     if ( 'category' == $taxonomy )
@@ -192 +192 @@
 
     if ( 'category' == $taxonomy )
-        $help .= '<p>' . __('<a href="http://codex.wordpress.org/Manage_Categories_SubPanel" target="_blank">Categories Documentation</a>') . '</p>';
-    else
-        $help .= '<p>' . __('<a href="http://codex.wordpress.org/Post_Tags_SubPanel" target="_blank">Tags Documentation</a>') . '</p>';
-
-    $help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
+        $help .= '<p>' . __('<a href="http://codex.wordpress.org/Manage_Categories_SubPanel">Categories Documentation</a>') . '</p>';
+    else
+        $help .= '<p>' . __('<a href="http://codex.wordpress.org/Post_Tags_SubPanel">Tags Documentation</a>') . '</p>';
+
+    $help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
 
     add_contextual_help($current_screen, $help);
@@ -297 +297 @@
 
 <div class="clear"></div>
+<?php $table_type = ('category' == $taxonomy ? 'categories' : 'edit-tags'); ?>
 <table class="widefat tag fixed" cellspacing="0">
     <thead>
     <tr>
-<?php print_column_headers($current_screen); ?>
+<?php print_column_headers($table_type); ?>
     </tr>
     </thead>
@@ -306 +307 @@
     <tfoot>
     <tr>
-<?php print_column_headers($current_screen, false); ?>
+<?php print_column_headers($table_type, false); ?>
     </tr>
     </tfoot>
@@ -338 +339 @@
 <div class="form-wrap">
 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
-<?php if ( current_user_can( 'import' ) ) : ?>
 <p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'import.php') ?></p>
-<?php endif; ?>
-</div>
-<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
+</div>
+<?php elseif ( 'post_tag' == $taxonomy ) : ?>
 <div class="form-wrap">
 <p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'import.php') ;?>.</p>
@@ -357 +356 @@
 
 <?php
-
-if ( !is_taxonomy_hierarchical($taxonomy) ) {
-    if ( current_user_can( $tax->cap->edit_terms ) )
-        $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
-    else
-        $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
-
-    if ( $tag_cloud ) :
-    ?>
+if ( current_user_can( $tax->cap->edit_terms ) )
+    $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
+else
+    $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
+
+if ( $tag_cloud ) :
+?>
 <div class="tagcloud">
 <h3><?php echo $tax->labels->popular_items; ?></h3>
@@ -372 +369 @@
 <?php
 endif;
-}
 
 if ( current_user_can($tax->cap->edit_terms) ) {
@@ -386 +382 @@
 <form id="addtag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="add-tag" />
-<input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <?php wp_nonce_field('add-tag'); ?>