Changeset 4779

Timestamp:

01/22/2007 07:05:48 AM (18 years ago)

Author:

ryan

Message:

Walker fix ups. fixes #3080

File:

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

trunk/wp-includes/classes.php

@@ -429 +429 @@
                 // Previous element is my parent. Descend a level.
                 array_unshift($parents, $previous_element);
+                if ( !$to_depth || ($depth < $to_depth) ) { //only descend if we're below $to_depth
+                    $cb_args = array_merge( array($output, $depth), $args);
+                    $output = call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+                } else if ( $to_depth && $depth == $to_depth  ) {  // If we've reached depth, end the previous element.
+                    $cb_args = array_merge( array($output, $previous_element, $depth), $args);
+                    $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                }
                 $depth++; //always do this so when we start the element further down, we know where we are
-                if ( !$to_depth || ($depth < $to_depth) ) { //only descend if we're below $to_depth
-                    $cb_args = array_merge( array($output, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
-                } else {  // If we've reached depth, end the previous element.
-                    $cb_args = array_merge( array($output, $previous_element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
-                }
             } else if ( $element->$parent_field == $previous_element->$parent_field) {
                 // On the same level as previous element.
@@ -453 +453 @@
                     $depth--;
                     if ( !$to_depth || ($depth < $to_depth) ) {
-                        $cb_args = array_merge( array($output, $depth - 1), $args);
+                        $cb_args = array_merge( array($output, $depth), $args);
                         $output = call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
                         $cb_args = array_merge( array($output, $parent, $depth - 1), $args);
@@ -491 +491 @@
     function start_lvl($output, $depth) {
         $indent = str_repeat("\t", $depth);
-        $output .= "$indent<ul>\n";
+        $output .= "\n$indent<ul>\n";
         return $output;
     }