Browse Source

bug fix.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
922f185b6f
  1. 2
      framework/yii/base/View.php
  2. 2
      framework/yii/bootstrap/NavBar.php
  3. 2
      framework/yii/debug/views/default/view.php

2
framework/yii/base/View.php

@ -577,7 +577,7 @@ class View extends Component
$bundle = $am->getBundle($name); $bundle = $am->getBundle($name);
$this->assetBundles[$name] = false; $this->assetBundles[$name] = false;
$bundle->registerAssets($this); $bundle->registerAssets($this);
$this->assetBundles[$name] = true; $this->assetBundles[$name] = $bundle;
} elseif ($this->assetBundles[$name] === false) { } elseif ($this->assetBundles[$name] === false) {
throw new InvalidConfigException("A circular dependency is detected for bundle '$name'."); throw new InvalidConfigException("A circular dependency is detected for bundle '$name'.");
} }

2
framework/yii/bootstrap/NavBar.php

@ -41,7 +41,7 @@ class NavBar extends Widget
*/ */
public $responsive = true; 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 * @see http://twitter.github.io/bootstrap/components.html#navbar
*/ */
public $brandLabel; public $brandLabel;

2
framework/yii/debug/views/default/view.php

@ -28,7 +28,7 @@ $this->title = 'Yii Debugger';
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<div class="list-group affix-top"> <div class="list-group">
<?php <?php
foreach ($panels as $id => $panel) { foreach ($panels as $id => $panel) {
$label = '<i class="glyphicon glyphicon-chevron-right"></i>' . Html::encode($panel->getName()); $label = '<i class="glyphicon glyphicon-chevron-right"></i>' . Html::encode($panel->getName());

Loading…
Cancel
Save