aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-16 17:29:42 -0700
committerfriendica <info@friendica.com>2012-06-16 17:29:42 -0700
commit7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687 (patch)
treecbf23264ae110e994a8b34280e1063974de8b5bc /include
parent217bd2a7045008cab2f025291d7c5a74bb49d918 (diff)
downloadvolse-hubzilla-7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687.tar.gz
volse-hubzilla-7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687.tar.bz2
volse-hubzilla-7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687.zip
rev update
Diffstat (limited to 'include')
-rw-r--r--include/config.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/config.php b/include/config.php
index 60cd00cf6..1f2a70e5a 100644
--- a/include/config.php
+++ b/include/config.php
@@ -22,13 +22,13 @@ function load_config($family) {
if(count($r)) {
foreach($r as $rr) {
$k = $rr['k'];
- if ($rr['cat'] === 'config') {
+ if ($family === 'config') {
$a->config[$k] = $rr['v'];
} else {
$a->config[$family][$k] = $rr['v'];
}
}
- } else if (isset($rr) && ($rr['cat'] != 'config')) {
+ } else if ($family != 'config') {
// Negative caching
$a->config[$family] = "!<unset>!";
}
@@ -126,7 +126,7 @@ function load_pconfig($uid,$family) {
$k = $rr['k'];
$a->config[$uid][$family][$k] = $rr['v'];
}
- } else if ($rr['cat'] != 'config') {
+ } else if ($family != 'config') {
// Negative caching
$a->config[$uid][$family] = "!<unset>!";
}