Ticket #28145: 28145.diff

tests/phpunit/tests/admin/includesTemplate.php

@@ -45 +45 @@
                 $this->assertEquals('', selected(0,false,false));
                 $this->assertEquals('', checked(0,false,false));
         }
+
+        function test_wp_terms_checklist_decendants_and_self() {
+                ob_start();
+                wp_terms_checklist( 0, array( 'decendants_and_self' => 1 ) );
+                $actual = ob_get_clean();
+                $expected = "\n<li id='category-1'><label class=\"selectit\"><input value=\"1\" type=\"checkbox\" name=\"post_category[]\" id=\"in-category-1\" disabled='disabled' /> Uncategorized</label></li>\n";
+                $this->assertSame( $actual, $expected );
+        }
 }

src/wp-admin/includes/template.php

@@ -202 +202 @@
                 ) );
         }
         if ( $descendants_and_self ) {
-                $categories = (array) get_terms( $taxonomy, array(
-                        'child_of' => $descendants_and_self,
-                        'hierarchical' => 0,
-                        'hide_empty' => 0
-                ) );
+                
+                if( is_taxonomy_hierarchical( $taxonomy ) ) {
+                        $categories = (array) get_terms( $taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
+                } else {
+                        $categories = array();
+                }
+                
                 $self = get_term( $descendants_and_self, $taxonomy );
                 array_unshift( $categories, $self );
         } else {