diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-14 07:44:17 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-14 07:44:17 -0700 |
| commit | 1c5264d7f5a2914f3ae0cb1208b2bc2810b090ec (patch) | |
| tree | 4b6751a0daf69ac9a55fb2c1bb05a60fbc8d6b3e /modules/gallery/helpers | |
| parent | 821d3f7854d76922b53df7e523eeaa8d4dca8c7b (diff) | |
| parent | 793780daa7665f7f86994235c4263fcb63554eb8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers')
| -rw-r--r-- | modules/gallery/helpers/message.php | 1 | ||||
| -rw-r--r-- | modules/gallery/helpers/site_status.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/helpers/message.php b/modules/gallery/helpers/message.php index 047eb2c7..1f69e2a9 100644 --- a/modules/gallery/helpers/message.php +++ b/modules/gallery/helpers/message.php @@ -78,6 +78,7 @@ class message_Core { $messages = Session::instance()->get_once("messages", array()); foreach ($messages as $msg) { + $msg[0] = str_replace("__CSRF__", access::csrf_token(), $msg[0]); $buf[] = "<li class=\"" . self::severity_class($msg[1]) . "\">$msg[0]</li>"; } if ($buf) { diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php index 759eb382..13c42dda 100644 --- a/modules/gallery/helpers/site_status.php +++ b/modules/gallery/helpers/site_status.php @@ -100,7 +100,7 @@ class site_status_Core { } $buf = array(); foreach (ORM::factory("message")->find_all() as $msg) { - $value = str_replace('__CSRF__', access::csrf_token(), $msg->value); + $value = str_replace("__CSRF__", access::csrf_token(), $msg->value); $buf[] = "<li class=\"" . self::severity_class($msg->severity) . "\">$value</li>"; } |