summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-04-04 09:49:41 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-04-04 09:49:41 +0200
commit550505f51d2efbdf154dea82b69bcfb758b63785 (patch)
treef4f8879ad3ccef1df488087fac944ed411269001
parent40307ce67e9cb6cc8f00ddcddf1677f41b42fb83 (diff)
parentd535a2e92c29b7a9cff84c344c6e474f654aaa9e (diff)
downloadrpg-550505f51d2efbdf154dea82b69bcfb758b63785.tar.gz
rpg-550505f51d2efbdf154dea82b69bcfb758b63785.tar.bz2
Merge remote branch 'stretchyboy/master'
-rw-r--r--inc/common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/common.php b/inc/common.php
index 2877bc00e..4e5a2e197 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -836,7 +836,7 @@ function pageTemplate($id){
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function parsePageTemplate($data) {
+function parsePageTemplate(&$data) {
extract($data);
global $USERINFO;
@@ -879,7 +879,7 @@ function parsePageTemplate($data) {
// we need the callback to work around strftime's char limit
$tpl = preg_replace_callback('/%./',create_function('$m','return strftime($m[0]);'),$tpl);
-
+ $data['tpl'] = $tpl;
return $tpl;
}