Changeset 32117

Timestamp:

04/13/2015 01:20:57 AM (12 years ago)

Author:

SergeyBiryukov

Message:

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

props dlh.
fixes #31954.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/wpUpdateTerm.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

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

trunk/tests/phpunit/tests/term/wpUpdateTerm.php

@@ -654 +654 @@
                 _unregister_taxonomy( 'wptests_tax' );
         }
+
+        /**
+         * @ticket 31954
+         */
+        public function test_wp_update_term_with_null_get_term() {
+                $t = $this->factory->term->create( array( 'taxonomy' => 'category' ) );
+                $found = wp_update_term( $t, 'post_tag', array( 'slug' => 'foo' ) );
+
+                $this->assertWPError( $found );
+                $this->assertSame( 'invalid_term', $found->get_error_code() );
+        }
+
 }