MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

set_config anomaly

Browse source
This commit is contained in:
Friendika 2011-01-03 23:53:37 -08:00
parent 20cc007655
commit dbab3100de
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
boot.php
View file

@ -1096,7 +1096,6 @@ if(! function_exists('set_config')) {
function set_config($family,$key,$value) { function set_config($family,$key,$value) {
global $a; global $a;
$a->config[$family][$key] = $value;
if(get_config($family,$key,true) === false) { if(get_config($family,$key,true) === false) {
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
@ -1113,6 +1112,9 @@ function set_config($family,$key,$value) {
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
$a->config[$family][$key] = $value;
if($ret) if($ret)
return $value; return $value;
return $ret; return $ret;
@ -1149,11 +1151,13 @@ function get_pconfig($uid,$family, $key, $instore = false) {
return $a->config[$uid][$family][$key]; return $a->config[$uid][$family][$key];
} }
} }
$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",
intval($uid), intval($uid),
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
if(count($ret)) { if(count($ret)) {
$a->config[$uid][$family][$key] = $ret[0]['v']; $a->config[$uid][$family][$key] = $ret[0]['v'];
return $ret[0]['v']; return $ret[0]['v'];
@ -1186,7 +1190,6 @@ if(! function_exists('set_pconfig')) {
function set_pconfig($uid,$family,$key,$value) { function set_pconfig($uid,$family,$key,$value) {
global $a; global $a;
$a->config[$uid][$family][$key] = $value;
if(get_pconfig($uid,$family,$key,true) === false) { if(get_pconfig($uid,$family,$key,true) === false) {
$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
@ -1206,6 +1209,8 @@ function set_pconfig($uid,$family,$key,$value) {
dbesc($key) dbesc($key)
); );
$a->config[$uid][$family][$key] = $value;
if($ret) if($ret)
return $value; return $value;
return $ret; return $ret;