summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2014-02-02 19:34:18 +0000
committerChristopher Smith <chris@jalakai.co.uk>2014-02-02 19:34:18 +0000
commit17448fb8ad4bfc5bbabcbd5419cafdef1b9be18f (patch)
tree041bbb0e4d82faec1837f8c7108f16d9347d5b9f /inc/template.php
parent73f25ac04a7caaa8cdb07bfc71e807f46f227f97 (diff)
downloadrpg-17448fb8ad4bfc5bbabcbd5419cafdef1b9be18f.tar.gz
rpg-17448fb8ad4bfc5bbabcbd5419cafdef1b9be18f.tar.bz2
Update tpl_getConf() signature to match plugin::getConf()
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/inc/template.php b/inc/template.php
index 60e178d1a..0a6a9e4aa 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1123,10 +1123,11 @@ function tpl_indexerWebBug() {
*
* use this function to access template configuration variables
*
- * @param string $id
- * @return string
+ * @param string $id name of the value to access
+ * @param mixed $notset what to return if the setting is not available
+ * @return mixed
*/
-function tpl_getConf($id) {
+function tpl_getConf($id, $notset=false) {
global $conf;
static $tpl_configloaded = false;
@@ -1143,7 +1144,11 @@ function tpl_getConf($id) {
}
}
- return $conf['tpl'][$tpl][$id];
+ if(isset($conf['tpl'][$tpl][$id])){
+ return $conf['tpl'][$tpl][$id];
+ }
+
+ return $notset;
}
/**