aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Zuehl <hzuehl@phone-talk.de>2012-06-16 15:07:23 +0200
committerHauke Zuehl <hzuehl@phone-talk.de>2012-06-16 15:07:23 +0200
commit1231dd72f02fdec59b78ed9a6408887c2ae0b8d4 (patch)
tree7d958b06a458c509ad573b7c988de5600a3f9e47
parent64b4bbd65d9f9c956ffffe84215ce547d3b61512 (diff)
downloadvolse-hubzilla-1231dd72f02fdec59b78ed9a6408887c2ae0b8d4.tar.gz
volse-hubzilla-1231dd72f02fdec59b78ed9a6408887c2ae0b8d4.tar.bz2
volse-hubzilla-1231dd72f02fdec59b78ed9a6408887c2ae0b8d4.zip
Check if $rr exists
-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>!";
}