WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Press This: show error message when the user is attempting to add a category that already exists. 

Fixes #32339.
Built from https://develop.svn.wordpress.org/trunk@32827


git-svn-id: http://core.svn.wordpress.org/trunk@32798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-06-17 23:13:26 +00:00
parent b14c6bea0b
commit b77a3a33f5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/class-wp-press-this.php
View File

@ -201,11 +201,17 @@ class WP_Press_This {
continue;
}
// @todo Find a more performant to check existence, maybe get_term() with a separate parent check.
if ( ! $cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) ) {
$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
// @todo Find a more performant way to check existence, maybe get_term() with a separate parent check.
if ( term_exists( $cat_name, $taxonomy->name, $parent ) ) {
if ( count( $names ) === 1 ) {
wp_send_json_error( array( 'errorMessage' => __( 'This category already exists.' ) ) );
} else {
continue;
}
}
$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
if ( is_wp_error( $cat_id ) ) {
continue;
} elseif ( is_array( $cat_id ) ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32826';
$wp_version = '4.3-alpha-32827';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.