strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Code cleanup

Browse source
This commit is contained in:
Michael Vogel 2013-08-12 11:14:02 +02:00
parent e75f88d7fe
commit 694ca8fc57
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/config.php
View file

@ -70,7 +70,6 @@ function get_config($family, $key, $instore = false) {
if (function_exists("apc_fetch") AND function_exists("apc_exists")) if (function_exists("apc_fetch") AND function_exists("apc_exists"))
if (apc_exists($family."|".$key)) { if (apc_exists($family."|".$key)) {
$val = apc_fetch($family."|".$key); $val = apc_fetch($family."|".$key);
//logger("APC: fetched stored value ".$family."|".$key, LOGGER_DEBUG);
$a->config[$family][$key] = $val; $a->config[$family][$key] = $val;
if ($val === '!<unset>!') if ($val === '!<unset>!')
@ -78,9 +77,6 @@ function get_config($family, $key, $instore = false) {
else else
return $val; return $val;
} }
// else
//logger("APC: cache miss for value ".$family."|".$key, LOGGER_DEBUG);
$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($family), dbesc($family),
@ -201,15 +197,13 @@ function get_pconfig($uid,$family, $key, $instore = false) {
if (function_exists("apc_fetch") AND function_exists("apc_exists")) if (function_exists("apc_fetch") AND function_exists("apc_exists"))
if (apc_exists($uid."|".$family."|".$key)) { if (apc_exists($uid."|".$family."|".$key)) {
$val = apc_fetch($uid."|".$family."|".$key); $val = apc_fetch($uid."|".$family."|".$key);
//logger("APC: fetched stored value ".$uid."|".$family."|".$key, LOGGER_DEBUG);
$a->config[$uid][$family][$key] = $val; $a->config[$uid][$family][$key] = $val;
if ($val === '!<unset>!') if ($val === '!<unset>!')
return false; return false;
else else
return $val; return $val;
} // else }
//logger("APC: cache miss for value ".$family."|".$key, LOGGER_DEBUG);
$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",