From 9cc8f62d3ebfa059c240058523149fa1476033e9 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Tue, 10 Apr 2012 21:39:21 -0600
Subject: [PATCH] Fix #366 - Remove conflict with custom nav walkers

---
 inc/roots-cleanup.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/inc/roots-cleanup.php b/inc/roots-cleanup.php
index f6bcf7e..cace667 100644
--- a/inc/roots-cleanup.php
+++ b/inc/roots-cleanup.php
@@ -507,13 +507,11 @@ class Roots_Navbar_Nav_Walker extends Walker_Nav_Menu {
 }
 
 function roots_nav_menu_args($args = '') {
-  $args['container']  = false;
-  $args['depth']      = 2;
-  $args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
-  if (!$args['walker']) {
-    $args['walker'] = new Roots_Nav_Walker();
-  }
-  return $args;
+  $roots_nav_menu_args['container']  = false;
+  $roots_nav_menu_args['depth']      = 2;
+  $roots_nav_menu_args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
+  $roots_nav_menu_args['walker'] = new Roots_Nav_Walker();
+  return array_merge($roots_nav_menu_args, $args);
 }
 
 add_filter('wp_nav_menu_args', 'roots_nav_menu_args');