From 0475eb62cc1d04560cfcacbf039313d84f905192 Mon Sep 17 00:00:00 2001
From: Christoffer Niska <ChristofferNiska@gmail.com>
Date: Mon, 25 Mar 2013 20:52:03 +0200
Subject: [PATCH] Fix an issue with the navbar menu

---
 .gitignore           | 4 ++--
 widgets/TbNavbar.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba9a48d..45e9d38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,9 +20,9 @@ nbproject
 # mac deployment helpers
 switch
 
-# Composer stuff
+# Composer files
 composer*
-vendor*
+vendor/*
 
 # docs app
 docs/app/runtime
diff --git a/widgets/TbNavbar.php b/widgets/TbNavbar.php
index 0a99643..94874db 100644
--- a/widgets/TbNavbar.php
+++ b/widgets/TbNavbar.php
@@ -113,12 +113,13 @@ public function run()
 			$this->collapseOptions = TbHtml::addClassName('nav-collapse', $this->collapseOptions);
 			echo TbHtml::collapseIcon('#' . $collapseId) . PHP_EOL;
 			echo $brand . PHP_EOL;
-			$this->controller->widget('bootstrap.widgets.TbCollapse', array(
+			$this->controller->beginWidget('bootstrap.widgets.TbCollapse', array(
 				'id' => $collapseId,
-				'content' => $items,
 				'toggle' => false, // navbars are collapsed by default
 				'htmlOptions' => $this->collapseOptions,
 			));
+			echo $items;
+			$this->controller->endWidget();
 		}
 		else
 		{