friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2603 from fabrixxm/0613-confix-fix-2 

Fix Config and PConfig ::get() on new keys
This commit is contained in:
rabuzarus 2016-06-13 11:01:14 +02:00 committed by GitHub
parent 869a439466 6e28cdf2ee
commit 9371a004d9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Core/Config.php
View File

@ -172,7 +172,7 @@ class Config {
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
if(self::get($family,$key,null,true) === false) {
if(is_null(self::get($family,$key,null,true))) {
$a->config[$family][$key] = $value;
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family),

2
include/Core/PConfig.php
View File

@ -161,7 +161,7 @@ class PConfig {
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
if(self::get($uid,$family,$key,null, true) === false) {
if(is_null(self::get($uid,$family,$key,null, true))) {
$a->config[$uid][$family][$key] = $value;
$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
intval($uid),