Merged in klimser/yii-bootstrap (pull request #53)

Fix for incorrect alerts "close" link shows

Merged in klimser/yii-bootstrap (pull request #53)
5d53f4e3 · Christoffer Niska · bfedaa46 · 99839dc7 · 5d53f4e3
Commit 5d53f4e3 authored Mar 17, 2013 by Christoffer Niska
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

TbAlert.php widgets/TbAlert.php +2 -4

No files found.
--- a/widgets/TbAlert.php
+++ b/widgets/TbAlert.php
@@ -113,13 +113,11 @@ class TbAlert extends CWidget

 				echo CHtml::openTag('div', $alert['htmlOptions']);

-				if ($this->closeText !== false && !isset($alert['closeText']))
+				if (!isset($alert['closeText']))
 					$alert['closeText'] = $this->closeText;
-				else
-					$alert['closeText'] = false;

 				if ($alert['closeText'] !== false)
-					echo '<a class="close" data-dismiss="alert">'.$alert['closeText'].'</a>';
+					echo '<a href="#" class="close" data-dismiss="alert">'.$alert['closeText'].'</a>';

 				echo Yii::app()->user->getFlash($type);