aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-10-30 12:01:42 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-10-30 12:01:42 -0700
commit9b20ccfd7e19ff8624db6132a17c81def33d8022 (patch)
tree27fe8dacb305fc0e2343e43f2d89202d60894cd8 /views/default
parent3f9abf384029bf3fc899be2eead4e3121d20e331 (diff)
parentedec092e1aa616561063214a66620f9b6852875d (diff)
downloadelgg-9b20ccfd7e19ff8624db6132a17c81def33d8022.tar.gz
elgg-9b20ccfd7e19ff8624db6132a17c81def33d8022.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'views/default')
-rw-r--r--views/default/output/longtext.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php
index ffdfd87cc..200f27de5 100644
--- a/views/default/output/longtext.php
+++ b/views/default/output/longtext.php
@@ -25,12 +25,12 @@ unset($vars['parse_urls']);
$text = $vars['value'];
unset($vars['value']);
-$text = filter_tags($text);
-
if ($parse_urls) {
$text = parse_urls($text);
}
+$text = filter_tags($text);
+
$text = autop($text);
$attributes = elgg_format_attributes($vars);