diff options
| author | Fabio Comuni <fabio@krik.localdomain> | 2012-01-02 15:32:37 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabio@krik.localdomain> | 2012-01-02 15:32:37 +0100 |
| commit | be2fd56aae51ee02b6e40dedd4383e1ebddc752e (patch) | |
| tree | 1795fb34e182f51b6adc4f05204cea45da4bca69 /include/config.php | |
| parent | 4b095665791424bd2f5c4c494a2d14ec6c07aeba (diff) | |
| parent | 0dce36bdbce7482329105e2c1ef4f3c8b3043803 (diff) | |
| download | volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.tar.gz volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.tar.bz2 volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.zip | |
Merge branch 'master' of github.com:fabrixxm/friendica
Diffstat (limited to 'include/config.php')
| -rw-r--r-- | include/config.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/config.php b/include/config.php index f565ab117..92694f519 100644 --- a/include/config.php +++ b/include/config.php @@ -145,8 +145,9 @@ function get_pconfig($uid,$family, $key, $instore = false) { ); if(count($ret)) { - $a->config[$uid][$family][$key] = $ret[0]['v']; - return $ret[0]['v']; + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$uid][$family][$key] = $val; + return $val; } else { $a->config[$uid][$family][$key] = '!<unset>!'; @@ -177,20 +178,23 @@ function set_pconfig($uid,$family,$key,$value) { global $a; + // manage array value + $dbvalue = (is_array($value)?serialize($value):$value); + if(get_pconfig($uid,$family,$key,true) === false) { $a->config[$uid][$family][$key] = $value; $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", intval($uid), dbesc($family), dbesc($key), - dbesc($value) + dbesc($dbvalue) ); if($ret) return $value; return $ret; } $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($value), + dbesc($dbvalue), intval($uid), dbesc($family), dbesc($key) |