summaryrefslogtreecommitdiff
path: root/inc/plugin.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-11-09 16:31:57 +0100
committerAndreas Gohr <andi@splitbrain.org>2012-11-09 16:31:57 +0100
commit2657e46860a359adae6f3bf3bbf8d7fcaf626f31 (patch)
treeb5d189a0ba00d63d6bbc1de6a5329a0b23355949 /inc/plugin.php
parent70e4a085e6a861a12a7b927ba9dfa10d5961f958 (diff)
downloadrpg-2657e46860a359adae6f3bf3bbf8d7fcaf626f31.tar.gz
rpg-2657e46860a359adae6f3bf3bbf8d7fcaf626f31.tar.bz2
authmysql fixes
* use proper plugin config * code/PHP5 cleanup
Diffstat (limited to 'inc/plugin.php')
-rw-r--r--inc/plugin.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/inc/plugin.php b/inc/plugin.php
index 0e17dc417..2b4111fe1 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -134,12 +134,20 @@ class DokuWiki_Plugin {
* getConf($setting)
*
* use this function to access plugin configuration variables
+ *
+ * @param string $setting the setting to access
+ * @param mixed $notset what to return if the setting is not available
+ * @return mixed
*/
- function getConf($setting){
+ function getConf($setting, $notset=false){
if (!$this->configloaded){ $this->loadConfig(); }
- return $this->conf[$setting];
+ if(isset($this->conf[$setting])){
+ return $this->conf[$setting];
+ }else{
+ return $notset;
+ }
}
/**