Skip to content

Commit fa2a71a

Browse files
committed
Update flash elements to allow escaping.
1 parent de82953 commit fa2a71a

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

src/Template/Element/Flash/error.ctp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*/
1515

1616
$helper = new \Bootstrap\View\Helper\BootstrapHtmlHelper ($this) ;
17-
echo $helper->alert (h($message), 'danger', $params) ;
17+
if (!isset($params['escape']) || $params['escape'] !== false) {
18+
$message = h($message);
19+
}
20+
echo $helper->alert($message, 'danger', $params) ;
1821

1922
?>

src/Template/Element/Flash/info.ctp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*/
1515

1616
$helper = new \Bootstrap\View\Helper\BootstrapHtmlHelper ($this) ;
17-
echo $helper->alert (h($message), 'info', $params) ;
17+
if (!isset($params['escape']) || $params['escape'] !== false) {
18+
$message = h($message);
19+
}
20+
echo $helper->alert($message, 'info', $params) ;
1821

1922
?>

src/Template/Element/Flash/success.ctp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*/
1515

1616
$helper = new \Bootstrap\View\Helper\BootstrapHtmlHelper ($this) ;
17-
echo $helper->alert (h($message), 'success', $params) ;
17+
if (!isset($params['escape']) || $params['escape'] !== false) {
18+
$message = h($message);
19+
}
20+
echo $helper->alert($message, 'success', $params) ;
1821

1922
?>

src/Template/Element/Flash/warning.ctp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*/
1515

1616
$helper = new \Bootstrap\View\Helper\BootstrapHtmlHelper ($this) ;
17-
echo $helper->alert (h($message), 'warning', $params) ;
17+
if (!isset($params['escape']) || $params['escape'] !== false) {
18+
$message = h($message);
19+
}
20+
echo $helper->alert($message, 'warning', $params) ;
1821

1922
?>

0 commit comments

Comments
 (0)