Changeset 24377

Timestamp:

05/28/2013 03:29:15 AM (13 years ago)

Author:

SergeyBiryukov

Message:

Fix E_STRICT notices in walkers. props dvarga. see #24356.

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (modified) (5 diffs)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/class-wp-walker.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (2 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -15 +15 @@
          * @param string $output Passed by reference.
          */
-        function start_lvl(&$output) {}
+        function start_lvl( &$output, $depth = 0, $args = array() ) {}
 
         /**
@@ -23 +23 @@
          * @param string $output Passed by reference.
          */
-        function end_lvl(&$output) {
-        }
+        function end_lvl( &$output, $depth = 0, $args = array() ) {}
 
         /**
@@ -35 +34 @@
          * @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;
@@ -232 +231 @@
         }
 
-        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>";
@@ -251 +250 @@
          * @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;
 

trunk/wp-admin/includes/template.php

@@ -35 +35 @@
         }
 
-        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) )

trunk/wp-includes/category-template.php

@@ -934 +934 @@
          * @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);
 

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

@@ -81 +81 @@
          * @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 )  {}
 
         /**

trunk/wp-includes/comment-template.php

@@ -1326 +1326 @@
          * @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;

trunk/wp-includes/post-template.php

@@ -1054 +1054 @@
          * @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);
@@ -1136 +1136 @@
          * @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);