Changeset 6326 for trunk/wp-includes/taxonomy.php

Timestamp:

11/09/2007 06:34:41 PM (17 years ago)

Author:

ryan

Message:

Make term slug unique when moving to another parent.

File:

• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-includes/taxonomy.php

@@ -1207 +1207 @@
 
     // If we didn't get a unique slug, try appending a number to make it unique.
-    if ( $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
+    if ( !empty($args['term_id']) )
+        $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $args['term_id'] );
+    else
+        $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s $where", $slug );
+
+    if ( $wpdb->get_var( $query ) ) {
         $num = 2;
         do {
@@ -1282 +1287 @@
     $id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE slug = %s", $slug ) );
     if ( $id && ($id != $term_id) ) {
-        // If an empty slug was passed, reset the slug to something unique.
+        // If an empty slug was passed or the parent changed, reset the slug to something unique.
         // Otherwise, bail.
-        if ( $empty_slug )
+        if ( $empty_slug || ( $parent != $term->parent) )
             $slug = wp_unique_term_slug($slug, (object) $args);
         else