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

`wp_update_term()` should check if `get_term()` returned null. 

props dlh.
fixes #31954.
Built from https://develop.svn.wordpress.org/trunk@32117


git-svn-id: http://core.svn.wordpress.org/trunk@32096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-04-13 01:21:27 +00:00
parent 64fc7294b6
commit 55a1de9b4f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/taxonomy.php
View File

@ -3365,16 +3365,22 @@ function wp_unique_term_slug($slug, $term) {
function wp_update_term( $term_id, $taxonomy, $args = array() ) { function wp_update_term( $term_id, $taxonomy, $args = array() ) {
global $wpdb; global $wpdb;
if ( ! taxonomy_exists($taxonomy) ) if ( ! taxonomy_exists( $taxonomy ) ) {
return new WP_Error('invalid_taxonomy', __('Invalid taxonomy')); return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
}
$term_id = (int) $term_id; $term_id = (int) $term_id;
// First, get all of the original args // First, get all of the original args
$term = get_term ($term_id, $taxonomy, ARRAY_A); $term = get_term( $term_id, $taxonomy, ARRAY_A );
if ( is_wp_error( $term ) ) if ( is_wp_error( $term ) ) {
return $term; return $term;
}
if ( ! $term ) {
return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
}
// Escape data pulled from DB. // Escape data pulled from DB.
$term = wp_slash($term); $term = wp_slash($term);

2
wp-includes/version.php
View File

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