diff options
author | Dries Buytaert <dries@buytaert.net> | 2003-12-30 12:10:51 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2003-12-30 12:10:51 +0000 |
commit | e8c7d2e092028448aa244afd6b41ebd7452d2d6a (patch) | |
tree | 9e0fb2ecb542d6e5ec3f665d60a7b80abd3e7756 /includes | |
parent | f6cae0943963e13be880e16c29f4e2560d9a030d (diff) | |
download | brdo-e8c7d2e092028448aa244afd6b41ebd7452d2d6a.tar.gz brdo-e8c7d2e092028448aa244afd6b41ebd7452d2d6a.tar.bz2 |
- Made it possible to set and display multiple status messages. Modified patch by
Kjartan.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/common.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/includes/common.inc b/includes/common.inc index 881f886e7..144a822bd 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -34,17 +34,16 @@ function drupal_get_title() { * @{ */ function drupal_set_message($message = NULL, $type = "status") { - static $stored_message; + static $stored_message = array(); if (isset($message)) { - $stored_message->message = $message; - $stored_message->type = $type; + $stored_message[] = array($message, $type); } return $stored_message; } -function drupal_get_message() { +function drupal_get_messages() { return drupal_set_message(); } // @} @@ -437,7 +436,6 @@ function valid_input_data($data) { // check attributes: $match += preg_match("/\W(dynsrc|datasrc|data|lowsrc|on[a-z]+)\s*=[^>]+?>/i", $data); - // check tags: $match += preg_match("/<\s*(applet|script|object|style|embed|form|blink|meta|html|frame|iframe|layer|ilayer|head|frameset|xml)/i", $data); |