X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconfig.php;h=1f2a70e5a144bc4529523bd104b1428646b1c29b;hb=9553aeb3bd26e3e18b7677a26982a6b1df4c55fb;hp=6edc3f286c66750d6fce1fdba98a51fb9e517385;hpb=a71e3134bf7250b60cafd1e51098eea70c3459de;p=friendica.git diff --git a/include/config.php b/include/config.php index 6edc3f286c..1f2a70e5a1 100644 --- a/include/config.php +++ b/include/config.php @@ -18,18 +18,19 @@ 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']; - if ($rr['cat'] === 'config') { + if ($family === 'config') { $a->config[$k] = $rr['v']; } else { $a->config[$family][$k] = $rr['v']; } } + } else if ($family != 'config') { + // Negative caching + $a->config[$family] = "!!"; } }} @@ -47,6 +48,13 @@ function get_config($family, $key, $instore = false) { global $a; if(! $instore) { + // Looking if the whole family isn't set + if(isset($a->config[$family])) { + if($a->config[$family] === '!!') { + return false; + } + } + if(isset($a->config[$family][$key])) { if($a->config[$family][$key] === '!!') { return false; @@ -87,11 +95,11 @@ function set_config($family,$key,$value) { dbesc($key), dbesc($dbvalue) ); - if($ret) + if($ret) return $value; return $ret; } - + $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", dbesc($dbvalue), dbesc($family), @@ -118,6 +126,9 @@ function load_pconfig($uid,$family) { $k = $rr['k']; $a->config[$uid][$family][$k] = $rr['v']; } + } else if ($family != 'config') { + // Negative caching + $a->config[$uid][$family] = "!!"; } }} @@ -129,6 +140,13 @@ function get_pconfig($uid,$family, $key, $instore = false) { global $a; if(! $instore) { + // Looking if the whole family isn't set + if(isset($a->config[$uid][$family])) { + if($a->config[$uid][$family] === '!!') { + return false; + } + } + if(isset($a->config[$uid][$family][$key])) { if($a->config[$uid][$family][$key] === '!!') { return false;