Ticket #24356: 24356.patch

wp-admin/includes/nav-menu.php

@@ -14 +14 @@
          *
          * @param string $output Passed by reference.
          */
-        function start_lvl(&$output) {}
+        function start_lvl( &$output, $depth = 0, $args = array() ) {}
 
         /**
          * @see Walker_Nav_Menu::end_lvl()
@@ -22 +22 @@
          *
          * @param string $output Passed by reference.
          */
-        function end_lvl(&$output) {
-        }
+        function end_lvl( &$output, $depth = 0, $args = array() ) {}
 
         /**
          * @see Walker::start_el()
@@ -34 +33 @@
          * @param int $depth Depth of menu item. Used for padding.
          * @param object $args
          */
-        function start_el(&$output, $item, $depth, $args) {
+        function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
                 global $_wp_nav_menu_max_depth;
                 $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
 
@@ -231 +230 @@
                 }
         }
 
-        function start_lvl( &$output, $depth ) {
+        function start_lvl( &$output, $depth = 0, $args = array() ) {
                 $indent = str_repeat( "\t", $depth );
                 $output .= "\n$indent<ul class='children'>\n";
         }
 
-        function end_lvl( &$output, $depth ) {
+        function end_lvl( &$output, $depth = 0, $args = array() ) {
                 $indent = str_repeat( "\t", $depth );
                 $output .= "\n$indent</ul>";
         }
@@ -250 +249 @@
          * @param int $depth Depth of menu item. Used for padding.
          * @param object $args
          */
-        function start_el(&$output, $item, $depth, $args) {
+        function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
                 global $_nav_menu_placeholder;
 
                 $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;

wp-admin/includes/template.php

@@ -34 +34 @@
                 $output .= "$indent</ul>\n";
         }
 
-        function start_el( &$output, $category, $depth, $args, $id = 0 ) {
+        function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
                 extract($args);
                 if ( empty($taxonomy) )
                         $taxonomy = 'category';

wp-includes/category-template.php

@@ -933 +933 @@
          * @param int $depth Depth of category. Used for padding.
          * @param array $args Uses 'selected' and 'show_count' keys, if they exist.
          */
-        function start_el( &$output, $category, $depth, $args, $id = 0 ) {
+        function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
                 $pad = str_repeat(' ', $depth * 3);
 
                 $cat_name = apply_filters('list_cats', $category->name, $category);

wp-includes/class-wp-walker.php

@@ -80 +80 @@
          *
          * @param string $output Passed by reference. Used to append additional content.
          */
-        function start_el( &$output, $object, $depth, $args, $current_object_id = 0 )  {}
+        function start_el( &$output, $object, $depth = 0, $args = array(), $current_object_id = 0 )  {}
 
         /**
          * Ends the element output, if needed.

wp-includes/comment-template.php

@@ -1325 +1325 @@
          * @param int $depth Depth of comment in reference to parents.
          * @param array $args
          */
-        function start_el( &$output, $comment, $depth, $args, $id = 0 ) {
+        function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
                 $depth++;
                 $GLOBALS['comment_depth'] = $depth;
                 $GLOBALS['comment'] = $comment;

wp-includes/post-template.php

@@ -1053 +1053 @@
          * @param int $current_page Page ID.
          * @param array $args
          */
-        function start_el( &$output, $page, $depth, $args, $current_page = 0 ) {
+        function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
                 if ( $depth )
                         $indent = str_repeat("\t", $depth);
                 else
@@ -1135 +1135 @@
          * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
          * @param int $id
          */
-        function start_el(&$output, $page, $depth, $args, $id = 0) {
+        function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
                 $pad = str_repeat(' ', $depth * 3);
 
                 $output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";