keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #336 from hauke68/master

Browse source 
Pull request
This commit is contained in:
friendica 2012-06-16 16:25:40 -07:00
commit 217bd2a704
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/config.php
View file

@ -18,9 +18,7 @@
if(! function_exists('load_config')) { if(! function_exists('load_config')) {
function load_config($family) { function load_config($family) {
global $a; global $a;
$r = q("SELECT * FROM `config` WHERE `cat` = '%s'", $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family));
dbesc($family)
);
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {
$k = $rr['k']; $k = $rr['k'];
@ -30,7 +28,7 @@ function load_config($family) {
$a->config[$family][$k] = $rr['v']; $a->config[$family][$k] = $rr['v'];
} }
} }
} else if ($rr['cat'] != 'config') { } else if (isset($rr) && ($rr['cat'] != 'config')) {
// Negative caching // Negative caching
$a->config[$family] = "!<unset>!"; $a->config[$family] = "!<unset>!";
} }