Changeset 25924

Timestamp:

10/26/2013 02:54:21 AM (13 years ago)

Author:

nacin

Message:

3.7 regression from [25119]: Have in_category() return false when the first argument is empty.

Merges [25923] to the 3.7 branch.

props ericlewis.
fixes #25706.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/category-template.php (modified) (1 diff)
• tests/phpunit/tests/taxonomy.php (modified) (1 diff)

branches/3.7/src/wp-includes/category-template.php

@@ -233 +233 @@
  */
 function in_category( $category, $post = null ) {
+        if ( empty( $category ) )
+                return false;
+
         return has_category( $category, $post );
 }

branches/3.7/tests/phpunit/tests/taxonomy.php

@@ -153 +153 @@
 
         }
+        /**
+         * @ticket 25706
+         */
+        function test_in_category() {
+                $post = $this->factory->post->create_and_get();
+
+                // in_category() returns false when first parameter is empty()
+                $this->assertFalse( in_category( '', $post ) );
+                $this->assertFalse( in_category( false, $post ) );
+                $this->assertFalse( in_category( null, $post ) );
+
+                // Test expected behavior of in_category()
+                $term = wp_insert_term( 'Test', 'category' );
+                wp_set_object_terms( $post->ID, $term['term_id'], 'category' );
+                $this->assertTrue( in_category( $term['term_id'], $post ) );
+        }
 }