aboutsummaryrefslogtreecommitdiffstats
path: root/include/template_processor.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-18 12:02:33 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-18 12:02:33 -0400
commit8b13358ce33a1d3f88dedf2d50c650017614f418 (patch)
treef3c256fb748d21440ea19a25fd2232c626fc1122 /include/template_processor.php
parent939c8d3c8d3dce18e136d9ddff5fb93f064c61c3 (diff)
parent09ed17df99dd3acebeba814ff19c43c6c4a512f8 (diff)
downloadvolse-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/template_processor.php')
-rwxr-xr-xinclude/template_processor.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template_processor.php b/include/template_processor.php
index 93bf391c5..4c317efe1 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -203,7 +203,7 @@
$os=$s; $count++;
$s = $this->var_replace($s);
}
- return template_unescape($s);
+ return $s;
}
}