Changeset 34246

Timestamp:

09/16/2015 06:49:28 PM (9 years ago)

Author:

boonebgorges

Message:

Failed get_term_by() lookups should always return false.

Previously, we sometimes returned null.

Props charlestonsw, tyxla.
Fixes #33281.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy-functions.php

@@ -804 +804 @@
     } else {
         $term = get_term( (int) $value, $taxonomy, $output, $filter );
-        if ( is_wp_error( $term ) )
+        if ( is_wp_error( $term ) || is_null( $term ) ) {
             $term = false;
+        }
         return $term;
     }

trunk/tests/phpunit/tests/term.php

@@ -56 +56 @@
         $term2 = get_term_by( 'term_taxonomy_id', $term1['term_taxonomy_id'], 'category' );
         $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
+    }
+
+    /**
+     * @ticket 33281
+     */
+    function test_get_term_by_with_nonexistent_id_should_return_false() {
+        $term = get_term_by( 'id', 123456, 'category' );
+        $this->assertFalse( $term );
     }