Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-08 17:38:26 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Props ramiy.
See #18218.
Built from https://develop.svn.wordpress.org/trunk@38162


git-svn-id: http://core.svn.wordpress.org/trunk@38103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-07-27 10:43:27 +00:00
parent b65bb2525e
commit ccf7a5ef24
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/taxonomy.php
View File

@ -2241,10 +2241,10 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
if ( is_wp_error( $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.' ) );
}
if ( '' == trim($term) ) {
if ( '' == trim( $term ) ) {
return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
}
$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['description'] = $description;
if ( '' == trim($name) )
return new WP_Error('empty_term_name', __('A name is required for this term'));
if ( '' == trim( $name ) ) {
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'] ) ) {
return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-beta4-38161';
$wp_version = '4.6-beta4-38162';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.