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

Timestamp:

01/24/2010 11:00:27 AM (15 years ago)

Author:

dd32

Message:

Merge Categories/Hierarchical taxonomies into edit-tags.php. See #11838

File:

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

trunk/wp-admin/edit-tags.php

@@ -45 +45 @@
     $ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
     if ( $ret && !is_wp_error( $ret ) ) {
-        wp_redirect('edit-tags.php?message=1#addtag');
+        wp_redirect("edit-tags.php?taxonomy=$taxonomy&message=1#addtag");
     } else {
-        wp_redirect('edit-tags.php?message=4#addtag');
+        wp_redirect("edit-tags.php?taxonomy=$taxonomy&message=4#addtag");
     }
     exit;
@@ -66 +66 @@
     wp_delete_term( $tag_ID, $taxonomy);
 
-    $location = 'edit-tags.php';
+    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
     if ( $referer = wp_get_referer() ) {
         if ( false !== strpos($referer, 'edit-tags.php') )
@@ -89 +89 @@
     }
 
-    $location = 'edit-tags.php';
+    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
     if ( $referer = wp_get_referer() ) {
         if ( false !== strpos($referer, 'edit-tags.php') )
@@ -121 +121 @@
     $ret = wp_update_term($tag_ID, $taxonomy, $_POST);
 
-    $location = 'edit-tags.php';
+    $location = 'edit-tags.php?taxonomy=' . $taxonomy;
     if ( $referer = wp_get_original_referer() ) {
         if ( false !== strpos($referer, 'edit-tags.php') )
@@ -201 +201 @@
 $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
 
-if ( !empty($_GET['s']) )
-    $total_terms = count( get_terms( $taxonomy, array( 'search' => trim(stripslashes($_GET['s'])), 'number' => 0, 'hide_empty' => 0 ) ) );
-else
+if ( !empty($_GET['s']) ) {
+    $searchterms = trim(stripslashes($_GET['s']));
+    $total_terms = count( get_terms( $taxonomy, array( 'search' => $searchterms, 'number' => 0, 'hide_empty' => 0 ) ) );
+} else {
+    $searchterms = '';
     $total_terms = wp_count_terms($taxonomy);
+}
 
 $page_links = paginate_links( array(
@@ -249 +252 @@
 <?php
 
-$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
-
 $count = tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy );
 ?>
@@ -313 +314 @@
 </div>
 <?php } ?>
+<?php if ( is_taxonomy_hierarchical($taxonomy) ) { ?>
+<div class="form-field">
+    <label for="category_parent"><?php _e('Category Parent') ?></label>
+    <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
+    <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
+</div>
+<?php } ?>
 <div class="form-field">
     <label for="description"><?php _e('Description') ?></label>
@@ -330 +338 @@
 </div><!-- /wrap -->
 
-<?php inline_edit_term_row('edit-tags'); ?>
+<?php inline_edit_term_row('edit-tags', $taxonomy); ?>
 
 <?php