Changeset 6839

Timestamp:

02/14/2008 02:51:12 AM (18 years ago)

Author:

ryan

Message:

Revert [6835] as it breaks the depth arg. see#5844

File:

• trunk/wp-includes/classes.php (modified) (3 diffs)

trunk/wp-includes/classes.php

@@ -418 +418 @@
                 $parent_field = $this->db_fields['parent'];
 
+                if ($depth > 0) {
+                        //start the child delimiter
+                        $cb_args = array_merge( array($output, $depth), $args);
+                        $output = call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+                }
+
                 //display this element
                 $cb_args = array_merge( array($output, $element, $depth), $args);
@@ -427 +433 @@
                         if ( $child->$parent_field == $element->$id_field ) {
 
-                                if ( !isset($newlevel) ) {
-                                        $newlevel = true; 
-                                        //start the child delimiter
-                                        $cb_args = array_merge( array($output, $depth), $args);
-                                        $output = call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
-                                }
-                                
                                 array_splice( $children_elements, $i, 1 );
                                 $output = $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
@@ -440 +439 @@
                 }
 
-                if ( isset($newlevel) && $newlevel ){
+                //end this element
+                $cb_args = array_merge( array($output, $element, $depth), $args);
+                $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+
+                if ($depth > 0) {
                         //end the child delimiter
                         $cb_args = array_merge( array($output, $depth), $args);
                         $output = call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
                 }
-                
-                //end this element
-                $cb_args = array_merge( array($output, $element, $depth), $args);
-                $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
 
                 return $output;