Wordpress 3.6

[autoinstalls/wordpress.git] / wp-includes / class-wp-walker.php

diff --git a/wp-includes/class-wp-walker.php b/wp-includes/class-wp-walker.php
index 25e040592cf87c170b44c65b3d5ec5c5827fa095..655e7f4671c973360863804476acce9dcb76a5e6 100644 (file)
--- a/wp-includes/class-wp-walker.php
+++ b/wp-includes/class-wp-walker.php
@@ -52,7 +52,7 @@ class Walker {
         *
         * @param string $output Passed by reference. Used to append additional content.
         */
         *
         * @param string $output Passed by reference. Used to append additional content.
         */

-       function start_lvl(&$output) {}
+       function start_lvl( &$output, $depth = 0, $args = array() ) {}

 
        /**
         * Ends the list of after the elements are added.
 
        /**
         * Ends the list of after the elements are added.


@@ -66,7 +66,7 @@ class Walker {
         *
         * @param string $output Passed by reference. Used to append additional content.
         */
         *
         * @param string $output Passed by reference. Used to append additional content.
         */

-       function end_lvl(&$output)   {}
+       function end_lvl( &$output, $depth = 0, $args = array() )   {}

 
        /**
         * Start the element output.
 
        /**
         * Start the element output.


@@ -80,7 +80,7 @@ class Walker {
         *
         * @param string $output Passed by reference. Used to append additional content.
         */
         *
         * @param string $output Passed by reference. Used to append additional content.
         */

-       function start_el(&$output)  {}
+       function start_el( &$output, $object, $depth = 0, $args = array(), $current_object_id = 0 )  {}

 
        /**
         * Ends the element output, if needed.
 
        /**
         * Ends the element output, if needed.


@@ -93,7 +93,7 @@ class Walker {
         *
         * @param string $output Passed by reference. Used to append additional content.
         */
         *
         * @param string $output Passed by reference. Used to append additional content.
         */

-       function end_el(&$output)    {}
+       function end_el( &$output, $object, $depth = 0, $args = array() )    {}

 
        /**
         * Traverse elements to create list from elements.
 
        /**
         * Traverse elements to create list from elements.


@@ -115,7 +115,7 @@ class Walker {
         * @param string $output Passed by reference. Used to append additional content.
         * @return null Null on failure with no changes to parameters.
         */
         * @param string $output Passed by reference. Used to append additional content.
         * @return null Null on failure with no changes to parameters.
         */

-       function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) {
+       function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {

 
                if ( !$element )
                        return;
 
                if ( !$element )
                        return;


@@ -123,10 +123,10 @@ class Walker {
                $id_field = $this->db_fields['id'];
 
                //display this element
                $id_field = $this->db_fields['id'];
 
                //display this element

-               if ( is_array( $args[0] ) )
+               if ( isset( $args[0] ) && is_array( $args[0] ) )

                        $args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
                $cb_args = array_merge( array(&$output, $element, $depth), $args);
                        $args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
                $cb_args = array_merge( array(&$output, $element, $depth), $args);

-               call_user_func_array(array(&$this, 'start_el'), $cb_args);
+               call_user_func_array(array($this, 'start_el'), $cb_args);

 
                $id = $element->$id_field;
 
 
                $id = $element->$id_field;
 


@@ -139,7 +139,7 @@ class Walker {
                                        $newlevel = true;
                                        //start the child delimiter
                                        $cb_args = array_merge( array(&$output, $depth), $args);
                                        $newlevel = true;
                                        //start the child delimiter
                                        $cb_args = array_merge( array(&$output, $depth), $args);

-                                       call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+                                       call_user_func_array(array($this, 'start_lvl'), $cb_args);

                                }
                                $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
                        }
                                }
                                $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
                        }


@@ -149,12 +149,12 @@ class Walker {
                if ( isset($newlevel) && $newlevel ){
                        //end the child delimiter
                        $cb_args = array_merge( array(&$output, $depth), $args);
                if ( isset($newlevel) && $newlevel ){
                        //end the child delimiter
                        $cb_args = array_merge( array(&$output, $depth), $args);

-                       call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
+                       call_user_func_array(array($this, 'end_lvl'), $cb_args);

                }
 
                //end this element
                $cb_args = array_merge( array(&$output, $element, $depth), $args);
                }
 
                //end this element
                $cb_args = array_merge( array(&$output, $element, $depth), $args);

-               call_user_func_array(array(&$this, 'end_el'), $cb_args);
+               call_user_func_array(array($this, 'end_el'), $cb_args);

        }
 
        /**
        }
 
        /**


@@ -395,5 +395,3 @@ class Walker {
 
        }
 }
 
        }
 }

-
-?>
\ No newline at end of file