sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

I18N: After [38077], merge two duplicate strings in wp_insert_term() and wp_update_term().

Browse Source 
Props ramiy.
See #18218.

git-svn-id: https://develop.svn.wordpress.org/trunk@38162 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2016-07-27 10:42:23 +00:00
parent d1aacf419e
commit a2175c9ede
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-includes/taxonomy.php
View File

@ -2241,10 +2241,10 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
if ( is_wp_error( $term ) ) { if ( is_wp_error( $term ) ) {
return $term; return $term;
} }
if ( is_int($term) && 0 == $term ) { if ( is_int( $term ) && 0 == $term ) {
return new WP_Error( 'invalid_term_id', __( 'Invalid term ID.' ) ); return new WP_Error( 'invalid_term_id', __( 'Invalid term ID.' ) );
} }
if ( '' == trim($term) ) { if ( '' == trim( $term ) ) {
return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) ); return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
} }
$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => ''); $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
@ -2845,8 +2845,9 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
$parsed_args['name'] = $name; $parsed_args['name'] = $name;
$parsed_args['description'] = $description; $parsed_args['description'] = $description;
if ( '' == trim($name) ) if ( '' == trim( $name ) ) {
return new WP_Error('empty_term_name', __('A name is required for this term')); return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
}
if ( $parsed_args['parent'] > 0 && ! term_exists( (int) $parsed_args['parent'] ) ) { if ( $parsed_args['parent'] > 0 && ! term_exists( (int) $parsed_args['parent'] ) ) {
return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) ); return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );