diff --git a/app/src/Template/Element/Flash/default.ctp b/app/src/Template/Element/Flash/default.ctp
index 5386cb904..c8bced80c 100644
--- a/app/src/Template/Element/Flash/default.ctp
+++ b/app/src/Template/Element/Flash/default.ctp
@@ -1,4 +1,6 @@
+
-= $message ?>
-*/ ?>
-
-', $filteredMessage);
- print "";
+ print "";
}
?>
diff --git a/app/src/Template/Element/Flash/information.ctp b/app/src/Template/Element/Flash/information.ctp
new file mode 100644
index 000000000..edf52fbd1
--- /dev/null
+++ b/app/src/Template/Element/Flash/information.ctp
@@ -0,0 +1,14 @@
+', $filteredMessage);
+ print "";
+ }
+?>
+
diff --git a/app/src/Template/Element/Flash/success.ctp b/app/src/Template/Element/Flash/success.ctp
index 402186144..864d55de3 100644
--- a/app/src/Template/Element/Flash/success.ctp
+++ b/app/src/Template/Element/Flash/success.ctp
@@ -1,18 +1,13 @@
-= $message ?>
-*/ ?>
+ if (!isset($params['escape']) || $params['escape'] !== false) {
+ $message = h($message); // XXX probably redundant
+ }
-', $filteredMessage);
- print "";
+ print "";
}
?>
diff --git a/app/src/Template/Element/javascript.ctp b/app/src/Template/Element/javascript.ctp
index 49969f870..0fcdb32c7 100644
--- a/app/src/Template/Element/javascript.ctp
+++ b/app/src/Template/Element/javascript.ctp
@@ -27,7 +27,7 @@
*/
?>
-
+
+= $this->Flash->render() ?>
\ No newline at end of file
diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp
index 4ad39ec4e..8a8dbdbe6 100644
--- a/app/src/Template/Layout/default.ctp
+++ b/app/src/Template/Layout/default.ctp
@@ -165,9 +165,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
]) . "\n"; ?>
- element('javascript'); ?>
+ = $this->element('javascript'); ?>
-
- = $this->Flash->render() ?>