aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-16 16:25:40 -0700
committerfriendica <info@friendica.com>2012-06-16 16:25:40 -0700
commit217bd2a7045008cab2f025291d7c5a74bb49d918 (patch)
tree3017ea74f2da0d3c0b5a8fa3f01c3a8c5294865d /include
parent950dacbbddfdd7dbec2042cf3db7c083bd96bfbf (diff)
parentcc7d849ce393a57fe6bb347c48c9a02f7e483789 (diff)
downloadvolse-hubzilla-217bd2a7045008cab2f025291d7c5a74bb49d918.tar.gz
volse-hubzilla-217bd2a7045008cab2f025291d7c5a74bb49d918.tar.bz2
volse-hubzilla-217bd2a7045008cab2f025291d7c5a74bb49d918.zip
Merge pull request #336 from hauke68/master
Pull request
Diffstat (limited to 'include')
-rw-r--r--include/config.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/config.php b/include/config.php
index df1070c13..60cd00cf6 100644
--- a/include/config.php
+++ b/include/config.php
@@ -18,9 +18,7 @@
if(! function_exists('load_config')) {
function load_config($family) {
global $a;
- $r = q("SELECT * FROM `config` WHERE `cat` = '%s'",
- dbesc($family)
- );
+ $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family));
if(count($r)) {
foreach($r as $rr) {
$k = $rr['k'];
@@ -30,7 +28,7 @@ function load_config($family) {
$a->config[$family][$k] = $rr['v'];
}
}
- } else if ($rr['cat'] != 'config') {
+ } else if (isset($rr) && ($rr['cat'] != 'config')) {
// Negative caching
$a->config[$family] = "!<unset>!";
}