Merge branch 'master' of https://github.com/aaronjorbin/develop.wordpress

Author: adamsilverstein

src/wp-admin/edit-tag-form.php

@@ -146,7 +146,7 @@
 <?php } ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 		<tr class="form-field term-parent-wrap">
-			<th scope="row"><label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label></th>
+			<th scope="row"><label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label></th>
 			<td>
 				<?php
 				$dropdown_args = array(

src/wp-admin/edit-tags.php

@@ -399,7 +399,7 @@
 <?php endif; // global_terms_enabled() ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 <div class="form-field term-parent-wrap">
-	<label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label>
+	<label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label>
 	<?php
 	$dropdown_args = array(
 		'hide_empty'       => 0,

src/wp-includes/class-wp-term-query.php

@@ -323,7 +323,7 @@ public function get_terms() {
 		 */
 		do_action( 'pre_get_terms', $this );
 
-		$taxonomies = $args['taxonomy'];
+		$taxonomies = (array) $args['taxonomy'];
 
 		// Save queries by not crawling the tree in the case of multiple taxes or a flat tax.
 		$has_hierarchical_tax = false;

src/wp-includes/taxonomy.php

@@ -2040,6 +2040,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	$name_matches = get_terms( $taxonomy, array(
 		'name' => $name,
 		'hide_empty' => false,
+		'parent' => $args['parent'],
 	) );
 
 	/*
@@ -2063,7 +2064,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 				$siblings = get_terms( $taxonomy, array( 'get' => 'all', 'parent' => $parent ) );
 
 				$existing_term = null;
-				if ( $name_match->slug === $slug && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
+				if ( ( ! $slug_provided || $name_match->slug === $slug ) && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
 					$existing_term = $name_match;
 				} elseif ( $slug_match && in_array( $slug, wp_list_pluck( $siblings, 'slug' ) ) ) {
 					$existing_term = $slug_match;

tests/phpunit/tests/term/wpInsertTerm.php

@@ -376,6 +376,58 @@ public function test_wp_insert_term_should_allow_duplicate_names_when_slug_is_a_
 		$this->assertSame( 'Foo', $t4_term->name );
 	}
 
+	/**
+	 * @ticket 39984
+	 */
+	public function test_duplicate_name_check_should_fail_when_no_slug_is_provided_even_when_slugs_would_not_clash() {
+		register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+		$t1 = self::factory()->term->create( array(
+			'name' => 'Foo',
+			'slug' => 'foo-no-conflict',
+			'taxonomy' => 'wptests_tax',
+		) );
+
+		$error = wp_insert_term( 'Foo', 'wptests_tax' );
+
+		$this->assertWPError( $error );
+		$this->assertSame( 'term_exists', $error->get_error_code() );
+		$this->assertSame( $t1, $error->get_error_data() );
+	}
+
+	/**
+	 * @ticket 39984
+	 */
+	public function test_error_should_reference_correct_term_when_rejected_as_duplicate() {
+		register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+		$t1 = self::factory()->term->create( array(
+			'name' => 'Foo',
+			'slug' => 'foo',
+			'taxonomy' => 'wptests_tax',
+		) );
+
+		$t2 = self::factory()->term->create( array(
+			'name' => 'Bar',
+			'slug' => 'bar',
+			'taxonomy' => 'wptests_tax',
+		) );
+
+		$t1_child = wp_insert_term( 'Child', 'wptests_tax', array(
+			'parent' => $t1,
+		) );
+
+		$t2_child = wp_insert_term( 'Child', 'wptests_tax', array(
+			'parent' => $t2,
+		) );
+
+		$error = wp_insert_term( 'Child', 'wptests_tax', array(
+			'parent' => $t2,
+		) );
+
+		$this->assertWPError( $error );
+		$this->assertSame( 'term_exists', $error->get_error_code() );
+		$this->assertSame( $t2_child['term_id'], $error->get_error_data() );
+	}
+
 	/**
 	 * @ticket 31328
 	 */