aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-19 09:34:39 +0100
committerzottel <github@zottel.net>2012-03-19 09:34:39 +0100
commit6d31e3d6ef56e22ecedccaeb6846b52da501097b (patch)
tree86518b59c0318d8057a1a8503c6354ebaa96dae3 /include/text.php
parentdf78c9be0bab909dfa8cf196f7aaa4ea3423be8c (diff)
parent283bc51acf479eebd54145eb639c681980f6717b (diff)
downloadvolse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.gz
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.bz2
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index cdf82ca87..89acbf9fa 100644
--- a/include/text.php
+++ b/include/text.php
@@ -20,7 +20,7 @@ function replace_macros($s,$r) {
//$a = get_app();
//$a->page['debug'] .= "$tt <br>\n";
- return $r;
+ return template_unescape($r);
}}