summaryrefslogtreecommitdiff
path: root/inc/common.php
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2011-04-02 03:36:26 +0100
committerChristopher Smith <chris@jalakai.co.uk>2011-04-02 03:36:26 +0100
commitefb973f8a33b893d0a4d46d6b733530833c4ad41 (patch)
tree9386f06b90a4fc6a5c31183793df17851ca0da26 /inc/common.php
parent344763ad4e90e41c8a94b0a69a527ff2d6319ab5 (diff)
parenta3f9f75c2624b73c4a57bf2a346ae71bf6a5fb98 (diff)
downloadrpg-efb973f8a33b893d0a4d46d6b733530833c4ad41.tar.gz
rpg-efb973f8a33b893d0a4d46d6b733530833c4ad41.tar.bz2
Merge branch 'master' of git@github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/common.php')
-rw-r--r--inc/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php
index 23d9c7155..ac7ddd653 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -843,7 +843,7 @@ function pageTemplate($id){
}
}
// load the content
- $data['tpl'] = io_readFile($data['tpl']);
+ $data['tpl'] = io_readFile($data['tplfile']);
}
if($data['doreplace']) parsePageTemplate(&$data);
}