From 47df2fb3fa0d3e81d0100a236d8bfbc8b6ced69a Mon Sep 17 00:00:00 2001
From: Foxaii <nick@foxaii.com>
Date: Mon, 15 Oct 2012 21:41:51 +0200
Subject: [PATCH 1/2] Unset menu bugfix. Support for additional classes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previous nav walker resulted in an error when no menu is set.
This fix supports supplementary classes i.e. nav-header nav-header-blue.
N.B. Bootstrap classes (nav-header, divider, divider-vertical) must be added first. 
---
 lib/nav.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/nav.php b/lib/nav.php
index 1d5be43..a7981e2 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -28,15 +28,12 @@ class Roots_Nav_Walker extends Walker_Nav_Menu {
       $item_html = str_replace('<a', '<a class="dropdown-toggle" data-toggle="dropdown" data-target="#"', $item_html);
       $item_html = str_replace('</a>', ' <b class="caret"></b></a>', $item_html);
     }
-    elseif (in_array('divider-vertical', $item->classes)) {
-      $item_html = '<li class="divider-vertical">';
-    }  
-    elseif (in_array('divider', $item->classes)) {
-      $item_html = '<li class="divider">';
-    }
-    elseif (in_array('nav-header', $item->classes)) {
-      $item_html = '<li class="nav-header">' . $item->title;
+    elseif (stristr($item_html,'li class="divider')) {
+      $item_html = preg_replace('/<a[^>]*>.*?<\/a>/iU', '', $item_html);    
     }
+    elseif (stristr($item_html,'li class="nav-header')) {
+      $item_html = preg_replace('/<a[^>]*>(.*)<\/a>/iU', '$1', $item_html);
+    }   
 
     $output .= $item_html;
   }
@@ -101,3 +98,4 @@ function roots_nav_menu_args($args = '') {
 
 add_filter('wp_nav_menu_args', 'roots_nav_menu_args');
 
+

From 14bf987971c4f80d811332a8fd908bf3927426eb Mon Sep 17 00:00:00 2001
From: Foxaii <nick@foxaii.com>
Date: Tue, 16 Oct 2012 14:07:10 +0200
Subject: [PATCH 2/2] Corrected spacing before pull.

---
 lib/nav.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/nav.php b/lib/nav.php
index a7981e2..195a04d 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -28,10 +28,10 @@ class Roots_Nav_Walker extends Walker_Nav_Menu {
       $item_html = str_replace('<a', '<a class="dropdown-toggle" data-toggle="dropdown" data-target="#"', $item_html);
       $item_html = str_replace('</a>', ' <b class="caret"></b></a>', $item_html);
     }
-    elseif (stristr($item_html,'li class="divider')) {
+    elseif (stristr($item_html, 'li class="divider')) {
       $item_html = preg_replace('/<a[^>]*>.*?<\/a>/iU', '', $item_html);    
     }
-    elseif (stristr($item_html,'li class="nav-header')) {
+    elseif (stristr($item_html, 'li class="nav-header')) {
       $item_html = preg_replace('/<a[^>]*>(.*)<\/a>/iU', '$1', $item_html);
     }