diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:42:26 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:42:26 +0000 |
| commit | df4226866779f75eacab7f62da36b22dc21d5e44 (patch) | |
| tree | e6c58d3d77187050fb4b966cc78a69766369c52c /views/default/messages | |
| parent | 60c1387a16ea4944674b0c9da2273158d1fbf0b4 (diff) | |
| download | elgg-df4226866779f75eacab7f62da36b22dc21d5e44.tar.gz elgg-df4226866779f75eacab7f62da36b22dc21d5e44.tar.bz2 | |
Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to plugins like groups and wire)
git-svn-id: http://code.elgg.org/elgg/trunk@6851 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/messages')
| -rw-r--r-- | views/default/messages/errors/error.php | 6 | ||||
| -rw-r--r-- | views/default/messages/messages/message.php | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php index 3175521d4..e681b090b 100644 --- a/views/default/messages/errors/error.php +++ b/views/default/messages/errors/error.php @@ -10,4 +10,8 @@ * * @uses $vars['object'] An error message (string) */ -echo elgg_view('output/longtext', array('value' => $vars['object'])); + +echo elgg_view('output/longtext', array( + 'value' => $vars['object'], + 'parse_urls' => FALSE) +); diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php index 58777a3cc..499165a90 100644 --- a/views/default/messages/messages/message.php +++ b/views/default/messages/messages/message.php @@ -11,4 +11,7 @@ * @uses $vars['object'] A system message (string) */ -echo elgg_view('output/longtext', array('value' => $vars['object'])); +echo elgg_view('output/longtext', array( + 'value' => $vars['object'], + 'parse_urls' => FALSE) +); |