diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-18 12:02:33 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-18 12:02:33 -0400 |
| commit | 8b13358ce33a1d3f88dedf2d50c650017614f418 (patch) | |
| tree | f3c256fb748d21440ea19a25fd2232c626fc1122 /include/text.php | |
| parent | 939c8d3c8d3dce18e136d9ddff5fb93f064c61c3 (diff) | |
| parent | 09ed17df99dd3acebeba814ff19c43c6c4a512f8 (diff) | |
| download | volse-hubzilla-8b13358ce33a1d3f88dedf2d50c650017614f418.tar.gz volse-hubzilla-8b13358ce33a1d3f88dedf2d50c650017614f418.tar.bz2 volse-hubzilla-8b13358ce33a1d3f88dedf2d50c650017614f418.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
replace split() by explode(); split is deprecated
lost changes to tinymce/bbcode
remove admin view of local directory
bug #337, call template_unescape() only at the end of template processing
queue optimisation - back off delivery attempts to once per hour after the first 12 hours.
* master:
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 2 |
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); }} |