From df4226866779f75eacab7f62da36b22dc21d5e44 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 22 Aug 2010 23:42:26 +0000 Subject: 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 --- views/default/output/longtext.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'views/default/output') diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php index a8540913f..1c57375de 100644 --- a/views/default/output/longtext.php +++ b/views/default/output/longtext.php @@ -8,10 +8,20 @@ * @author Curverider Ltd * @link http://elgg.org/ * - * @uses $vars['text'] The text to display - * + * @uses $vars['value'] The text to display + * @uses $vars['parse_urls'] Whether to turn urls into links. Default is true. */ -global $CONFIG; +$parse_urls = isset($vars['parse_urls']) ? $vars['parse_urls'] : TRUE; + +$text = $vars['value']; + +$text = filter_tags($text); + +if ($parse_urls) { + $text = parse_urls($text); +} + +$text = autop($text); -echo autop(parse_urls(filter_tags($vars['value']))); \ No newline at end of file +echo $text; -- cgit v1.2.3