From df03d5e0b6fe5694b3be18f7c735eb828c228ebe Mon Sep 17 00:00:00 2001 From: Joshua Roy Date: Thu, 20 Apr 2017 13:36:22 -0400 Subject: [PATCH] Fixing php warnings --- inc/nav-drop-multi-walker.php | 8 ++++---- inc/nav-tabs-walker.php | 16 ++++++++-------- inc/nav-walker.php | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/inc/nav-drop-multi-walker.php b/inc/nav-drop-multi-walker.php index 2a2bbc6..3eff9d1 100644 --- a/inc/nav-drop-multi-walker.php +++ b/inc/nav-drop-multi-walker.php @@ -22,7 +22,7 @@ if(!class_exists('Drop_Multi_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function start_lvl(&$output, $depth, $args) + function start_lvl(&$output, $depth = 0, $args = array()) { if(isset($args->with_search) && $args->with_search == true){ add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2); @@ -43,7 +43,7 @@ if(!class_exists('Drop_Multi_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function end_lvl(&$output, $depth) + function end_lvl(&$output, $depth = 0, $args = array()) { if ($depth == 0) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) @@ -58,7 +58,7 @@ if(!class_exists('Drop_Multi_Nav_Walker')) { /* Output the
  • and the containing * Note: $depth is "correct" at this level */ - function start_el(&$output, $item, $depth, $args) + function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) { global $wp_query; if ( $this->skip( $item ) ) return; @@ -135,7 +135,7 @@ if(!class_exists('Drop_Multi_Nav_Walker')) { * Note: the is already closed * Note 2: $depth is "correct" at this level */ - function end_el (&$output, $item, $depth, $args) + function end_el (&$output, $item, $depth = 0, $args = array()) { if ( $this->skip( $item ) ) return; $output .= '
    • '; diff --git a/inc/nav-tabs-walker.php b/inc/nav-tabs-walker.php index cf7dacd..ee05205 100644 --- a/inc/nav-tabs-walker.php +++ b/inc/nav-tabs-walker.php @@ -22,7 +22,7 @@ if(!class_exists('Top_Tabs_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function start_lvl(&$output, $depth, $args) + function start_lvl(&$output, $depth = 0, $args = array()) { if(isset($args->with_search) && $args->with_search == true){ add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2); @@ -43,7 +43,7 @@ if(!class_exists('Top_Tabs_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function end_lvl(&$output, $depth) + function end_lvl(&$output, $depth = 0, $args = array()) { if ($depth == 0) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) @@ -58,7 +58,7 @@ if(!class_exists('Top_Tabs_Nav_Walker')) { /* Output the
  • and the containing * Note: $depth is "correct" at this level */ - function start_el(&$output, $item, $depth, $args) + function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) { global $wp_query; if ( $this->skip( $item ) ) return; @@ -123,7 +123,7 @@ if(!class_exists('Top_Tabs_Nav_Walker')) { * Note: the is already closed * Note 2: $depth is "correct" at this level */ - function end_el (&$output, $item, $depth, $args) + function end_el (&$output, $item, $depth = 0, $args = array()) { if ( $this->skip( $item ) ) return; $output .= '
    • '; @@ -179,7 +179,7 @@ if(!class_exists('Tabs_Drop_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function start_lvl(&$output, $depth, $args) + function start_lvl(&$output, $depth = 0, $args = array()) { if(isset($args->with_search) && $args->with_search == true){ add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2); @@ -198,7 +198,7 @@ if(!class_exists('Tabs_Drop_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function end_lvl(&$output, $depth) + function end_lvl(&$output, $depth = 0, $args = array()) { if ($depth == 1) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) @@ -215,7 +215,7 @@ if(!class_exists('Tabs_Drop_Nav_Walker')) { /* Output the
  • and the containing * Note: $depth is "correct" at this level */ - function start_el(&$output, $item, $depth, $args) + function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0 ) { global $wp_query; if ( $this->skip( $item ) ) return; @@ -297,7 +297,7 @@ if(!class_exists('Tabs_Drop_Nav_Walker')) { * Note: the is already closed * Note 2: $depth is "correct" at this level */ - function end_el (&$output, $item, $depth, $args) + function end_el (&$output, $item, $depth = 0, $args = array()) { if ( $this->skip( $item ) ) return; $output .= '
    • '; diff --git a/inc/nav-walker.php b/inc/nav-walker.php index 658d1f3..22c76f6 100644 --- a/inc/nav-walker.php +++ b/inc/nav-walker.php @@ -22,7 +22,7 @@ if(!class_exists('Bootstrap_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function start_lvl(&$output, $depth, $args) + function start_lvl(&$output, $depth = 0, $args = array()) { if(isset($args->with_search) && $args->with_search == true){ add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2); @@ -43,7 +43,7 @@ if(!class_exists('Bootstrap_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function end_lvl(&$output, $depth) + function end_lvl(&$output, $depth = 0, $args = array()) { if ($depth == 0) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) @@ -58,7 +58,7 @@ if(!class_exists('Bootstrap_Nav_Walker')) { /* Output the
  • and the containing * Note: $depth is "correct" at this level */ - function start_el(&$output, $item, $depth, $args) + function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) { global $wp_query; if ( $this->skip( $item ) ) return; @@ -135,7 +135,7 @@ if(!class_exists('Bootstrap_Nav_Walker')) { * Note: the is already closed * Note 2: $depth is "correct" at this level */ - function end_el (&$output, $item, $depth, $args) + function end_el (&$output, $item, $depth = 0, $args = array()) { if ( $this->skip( $item ) ) return; $output .= '
    • '; @@ -176,7 +176,7 @@ if(!class_exists('Secondary_Bootstrap_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function start_lvl(&$output, $depth, $args) + function start_lvl(&$output, $depth = 0, $args = array()) { if(isset($args->with_search) && $args->with_search == true){ add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2); @@ -197,7 +197,7 @@ if(!class_exists('Secondary_Bootstrap_Nav_Walker')) { * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". * So basically add one to what you'd expect it to be */ - function end_lvl(&$output, $depth) + function end_lvl(&$output, $depth = 0, $args = array()) { $tabs = str_repeat("\t", $depth); $output .= "\n{$tabs}\n"; @@ -207,7 +207,7 @@ if(!class_exists('Secondary_Bootstrap_Nav_Walker')) { /* Output the
  • and the containing * Note: $depth is "correct" at this level */ - function start_el(&$output, $item, $depth, $args) + function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) { global $wp_query; $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; @@ -276,7 +276,7 @@ if(!class_exists('Secondary_Bootstrap_Nav_Walker')) { * Note: the is already closed * Note 2: $depth is "correct" at this level */ - function end_el (&$output, $item, $depth, $args) + function end_el (&$output, $item, $depth = 0, $args = array()) { $output .= '
    • '; return;