Ticket #33565: 33565.2.diff

src/wp-includes/category-template.php

@@ -1121 +1121 @@
                         );
 
                         if ( ! empty( $args['current_category'] ) ) {
-                                $_current_category = get_term( $args['current_category'], $category->taxonomy );
-                                if ( $category->term_id == $args['current_category'] ) {
-                                        $css_classes[] = 'current-cat';
-                                } elseif ( $category->term_id == $_current_category->parent ) {
-                                        $css_classes[] = 'current-cat-parent';
+                                // 'current_category' can be an array, so we use `get_terms()`.
+                                $_current_terms = get_terms( $category->taxonomy, array(
+                                        'include' => $args['current_category'],
+                                        'hide_empty' => false,
+                                ) );
+
+                                foreach ( $_current_terms as $_current_term ) {
+                                        if ( $category->term_id == $_current_term->term_id ) {
+                                                $css_classes[] = 'current-cat';
+                                        } elseif ( $category->term_id == $_current_term->parent ) {
+                                                $css_classes[] = 'current-cat-parent';
+                                        }
                                 }
                         }
 

tests/phpunit/tests/category/wpListCategories.php

@@ -46 +46 @@
         }
 
         /**
+         * @ticket 33565
+         */
+        public function test_current_category_should_accept_an_array_of_ids() {
+                $cats = $this->factory->category->create_many( 3 );
+
+                $found = wp_list_categories( array(
+                        'echo' => false,
+                        'hide_empty' => false,
+                        'current_category' => array( $cats[0], $cats[2] ),
+                ) );
+
+                $this->assertRegExp( '/class="[^"]*cat-item-' . $cats[0] . '[^"]*current-cat[^"]*"/', $found );
+                $this->assertNotRegExp( '/class="[^"]*cat-item-' . $cats[1] . '[^"]*current[^"]*"/', $found );
+                $this->assertRegExp( '/class="[^"]*cat-item-' . $cats[2] . '[^"]*current-cat[^"]*"/', $found );
+        }
+
+        /**
          * @ticket 16792
          */
         public function test_should_not_create_element_when_cat_name_is_filtered_to_empty_string() {