Changeset 28824

Timestamp:

06/24/2014 05:05:56 PM (10 years ago)

Author:

wonderboymusic

Message:

Ensure that a has_children parameter is given to Walker::start_el().

Adds unit tests.

Props scribu, obenland.
Fixes #14041.

Location:

trunk

Files:

• src/wp-includes/class-wp-walker.php (modified) (2 diffs)
• src/wp-includes/comment-template.php (modified) (2 diffs)
• tests/phpunit/tests/comment/walker.php (added)

trunk/src/wp-includes/class-wp-walker.php

@@ -41 +41 @@
 
     /**
+     * Wether the current element has children or not. To be used in start_el()
+     *
+     * @since 4.0.0
+     * @var bool
+     * @access protected
+     */
+    protected $has_children;
+
+    /**
      * Make private properties readable for backwards compatibility
      *
@@ -173 +182 @@
 
         $id_field = $this->db_fields['id'];
+        $id       = $element->$id_field;
 
         //display this element
-        if ( isset( $args[0] ) && is_array( $args[0] ) )
-            $args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
+        $this->has_children = ! empty( $children_elements[ $id ] );
+        if ( isset( $args[0] ) && is_array( $args[0] ) ) {
+            $args[0]['has_children'] = $this->has_children; // Backwards compatibility.
+        }
+
         $cb_args = array_merge( array(&$output, $element, $depth), $args);
         call_user_func_array(array($this, 'start_el'), $cb_args);
-
-        $id = $element->$id_field;
 
         // descend only when the depth is right and there are childrens for this element

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

@@ -1785 +1785 @@
         }
 ?>
-        <<?php echo $tag; ?> <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID(); ?>">
+        <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '' ); ?> id="comment-<?php comment_ID(); ?>">
         <?php if ( 'div' != $args['style'] ) : ?>
         <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
@@ -1831 +1831 @@
         $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
 ?>
-        <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
+        <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '' ); ?>>
             <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
                 <footer class="comment-meta">