Ticket #33565: 33565.diff

src/wp-includes/category-template.php

@@ -462 +462 @@
  *
  * @since 2.1.0
  * @since 4.4.0 Introduced the `hide_title_if_no_cats` argument.
+ * @since 4.4.0 Added option to pass an array of objects or IDs to $current_category
  *
  * @param string|array $args {
  *     Array of optional arguments.
@@ -488 +489 @@
  *     @type array|string $exclude_tree          Array or comma/space-separated string of term IDs to exclude, along
  *                                               with their descendants. See {@link get_terms()}. Default empty string.
  *     @type bool|int     $echo                  True to echo markup, false to return it. Default 1.
- *     @type int          $current_category      Category that should get the 'current-cat' class. Default 0.
+ *     @type array|int    $current_category      Category , array of category objects or an array of category IDs 
+ *                                               that should get the 'current-cat' class. Default 0.
  *     @type bool         $hierarchical          Whether to include terms that have non-empty descendants.
  *                                               See {@link get_terms()}. Default true.
  *     @type string       $title_li              Text to use for the list title `<li>` element. Pass an empty string
@@ -1121 +1123 @@
                         );
 
                         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';
+                                if (is_array($args['current_category'])) {
+                                        $current_terms = $args['current_category'];
+                                        foreach ($current_terms as $current_term) {
+                                                if (is_object($current_term)) $current_term = $current_term->term_id;
+                                                if (is_numeric($current_term)) {
+                                                        $_current_category = get_term( $current_term, $category->taxonomy );
+                                                        if ( $category->term_id == $current_term ) {
+                                                                $css_classes[] = 'current-cat';
+                                                        } elseif ( $category->term_id == $_current_category->parent ) {
+                                                                $css_classes[] = 'current-cat-parent';
+                                                        }
+                                                }
+                                        }
+                                } else {
+                                        $_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';
+                                        }
                                 }
                         }
 

tests/phpunit/tests/category/wpListCategories.php

@@ -247 +247 @@
 
                 $this->assertContains( '<li class="categories">Categories', $found );
         }
+
+        /**
+         * @ticket 33565
+         */
+         public function test_pass_array_of_objects_to_current_category() {
+                $c1 = $this->factory->category->create();
+                $c2 = $this->factory->category->create();
+                $c3 = $this->factory->category->create();
+                $object1 = $this->category_factory->get_object_by_id( $c1 );
+                $object2 = $this->category_factory->get_object_by_id( $c2 );
+                $object3 = $this->category_factory->get_object_by_id( $c3 );
+                
+                $found = wp_list_categories( array(
+                        'echo' => false,
+                        'hide_empty' => false,
+                        'current_category' => array($object2,$object3),
+                ) );
+                
+                $this->assertNotRegExp( '/class="[^"]*cat-item-' . $c1 . '[^"]*current-cat[^"]*"/', $found );
+                $this->assertRegExp( '/class="[^"]*cat-item-' . $c2 . '[^"]*current-cat[^"]*"/', $found );
+                $this->assertRegExp( '/class="[^"]*cat-item-' . $c3 . '[^"]*current-cat[^"]*"/', $found );
+         }
+         
+        /**
+         * @ticket 33565
+         */
+         public function test_pass_array_of_ids_to_current_category() {
+                $c1 = $this->factory->category->create();
+                $c2 = $this->factory->category->create();
+                $c3 = $this->factory->category->create();
+                
+                $found = wp_list_categories( array(
+                        'echo' => false,
+                        'hide_empty' => false,
+                        'current_category' => array($c2,$c3),
+                ) );
+                
+                $this->assertNotRegExp( '/class="[^"]*cat-item-' . $c1 . '[^"]*current-cat[^"]*"/', $found );
+                $this->assertRegExp( '/class="[^"]*cat-item-' . $c2 . '[^"]*current-cat[^"]*"/', $found );
+                $this->assertRegExp( '/class="[^"]*cat-item-' . $c3 . '[^"]*current-cat[^"]*"/', $found );
+         }
 }