summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-10 11:01:57 (GMT)
committerAleksander Machniak <alec@alec.pl>2013-09-10 11:01:57 (GMT)
commit55f414ca1144995d55768d4c679f2b70308882b0 (patch)
tree652fa0f8d35d746e0b72ab7d3e697f294108e8f3
parent0c3eaa895c8f387389fba28e1470c162d651ab67 (diff)
downloadkolab-wap-55f414ca1144995d55768d4c679f2b70308882b0.tar.gz
Removed fallback to primary domain section in Conf::get_raw()
-rw-r--r--lib/Conf.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Conf.php b/lib/Conf.php
index 01ea946..6131850 100644
--- a/lib/Conf.php
+++ b/lib/Conf.php
@@ -112,19 +112,20 @@ class Conf {
}
// If section is specified, but requested setting doesn't exist there
- // we'll fall back to (global) 'kolab' and primary domain section (in this order).
+ // we fall back to (global) 'kolab' section
if ($key2) {
if (isset($this->_conf['kolab'][$key2])) {
return $this->_conf['kolab'][$key2];
}
-
+/*
+ // fall back to primary domain section
$primary_domain = $this->_conf['kolab']['primary_domain'];
if ($primary_domain && isset($this->_conf[$primary_domain])) {
if (isset($this->_conf[$primary_domain][$key2])) {
return $this->_conf[$primary_domain][$key2];
}
}
-
+*/
return null;
}