Changeset 39280

Timestamp:

11/17/16 18:01:13 (8 months ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Prevent wp_list_categories() from producing not well-nested output if hide_title_if_empty is true.

Props chesio.
Fixes #38839. See #33460.

Location:

trunk

Files:

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

trunk/src/wp-includes/category-template.php

@@ -625 +625 @@
     }
 
-    if ( $r['title_li'] && 'list' == $r['style'] )
+    if ( $r['title_li'] && 'list' == $r['style'] && ( ! empty( $categories ) || ! $r['hide_title_if_empty'] ) ) {
         $output .= '</ul></li>';
+    }
 
     /**

trunk/tests/phpunit/tests/category/wpListCategories.php

@@ -264 +264 @@
 
         $this->assertContains( '<li class="categories">Categories', $found );
+    }
+
+    /**
+     * @ticket 38839
+     */
+    public function test_hide_title_if_empty_should_not_output_stray_closing_tags() {
+        $cat = self::factory()->category->create();
+
+        $found = wp_list_categories( array(
+            'echo' => false,
+            'show_option_none' => '',
+            'child_of' => 1,
+            'hide_title_if_empty' => true,
+        ) );
+
+        $this->assertNotContains( '</ul></li>', $found );
     }