From 922f185b6fe8d97f57b03fbbc587870ca4bc727b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 12 Aug 2013 20:05:54 -0400
Subject: [PATCH] bug fix.

---
 framework/yii/base/View.php                | 2 +-
 framework/yii/bootstrap/NavBar.php         | 2 +-
 framework/yii/debug/views/default/view.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/yii/base/View.php b/framework/yii/base/View.php
index c75c124..f37859a 100644
--- a/framework/yii/base/View.php
+++ b/framework/yii/base/View.php
@@ -577,7 +577,7 @@ class View extends Component
 			$bundle = $am->getBundle($name);
 			$this->assetBundles[$name] = false;
 			$bundle->registerAssets($this);
-			$this->assetBundles[$name] = true;
+			$this->assetBundles[$name] = $bundle;
 		} elseif ($this->assetBundles[$name] === false) {
 			throw new InvalidConfigException("A circular dependency is detected for bundle '$name'.");
 		}
diff --git a/framework/yii/bootstrap/NavBar.php b/framework/yii/bootstrap/NavBar.php
index d9dd2cd..888e0fe 100644
--- a/framework/yii/bootstrap/NavBar.php
+++ b/framework/yii/bootstrap/NavBar.php
@@ -41,7 +41,7 @@ class NavBar extends Widget
 	 */
 	public $responsive = true;
 	/**
-	 * @var string the text of the brand.
+	 * @var string the text of the brand. Note that this is not HTML-encoded.
 	 * @see http://twitter.github.io/bootstrap/components.html#navbar
 	 */
 	public $brandLabel;
diff --git a/framework/yii/debug/views/default/view.php b/framework/yii/debug/views/default/view.php
index c97de9a..190bbe2 100644
--- a/framework/yii/debug/views/default/view.php
+++ b/framework/yii/debug/views/default/view.php
@@ -28,7 +28,7 @@ $this->title = 'Yii Debugger';
 	<div class="container">
 		<div class="row">
 			<div class="col-lg-2">
-				<div class="list-group affix-top">
+				<div class="list-group">
 					<?php
 					foreach ($panels as $id => $panel) {
 						$label = '<i class="glyphicon glyphicon-chevron-right"></i>' . Html::encode($panel->getName());