Changeset 26544

Timestamp:

12/02/2013 11:05:49 PM (12 years ago)

Author:

nacin

Message:

Be specific in term_exists error messages in wp_insert_term() as to what already exists (name, or name and slug).

props ericmann, SergeyBiryukov.
fixes #15741.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -2144 +2144 @@
     $description = wp_unslash($description);
 
-    if ( empty($slug) )
+    $slug_provided = ! empty( $slug );
+    if ( ! $slug_provided ) {
         $slug = sanitize_title($name);
+    }
 
     $term_group = 0;
@@ -2169 +2171 @@
             $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => (int)$parent) );
             if ( in_array($name, $siblings) ) {
-                return new WP_Error('term_exists', __('A term with the name provided already exists with this parent.'), $exists['term_id']);
+                if ( $slug_provided ) {
+                    return new WP_Error( 'term_exists', __( 'A term with the name and slug provided already exists with this parent.' ), $exists['term_id'] );
+                } else {
+                    return new WP_Error( 'term_exists', __( 'A term with the name provided already exists with this parent.' ), $exists['term_id'] );
+                }
             } else {
                 $slug = wp_unique_term_slug($slug, (object) $args);
@@ -2184 +2190 @@
         } elseif ( $exists = term_exists( (int) $term_id, $taxonomy ) )  {
             // Same name, same slug.
-            return new WP_Error('term_exists', __('A term with the name provided already exists.'), $exists['term_id']);
+            return new WP_Error( 'term_exists', __( 'A term with the name and slug provided already exists.' ), $exists['term_id'] );
         }
     } else {