Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 01:25:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: Caching of non string cache values now works.

Browse source
This commit is contained in:
Michael 2017-01-24 18:55:07 +00:00
parent df28f99caa
commit becfeaf0b7
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/Core/Config.php
View file

@ -139,24 +139,31 @@ class Config {
public static function set($family, $key, $value) {
$a = get_app();
// We always store boolean values as integer.
// And when fetching we don't convert them back to boolean.
// So we have to do the conversion here so that the compare below works.
$dbvalue = (is_bool($value) ? (string)intval($value) : $value);
// Convert the numeric values to string to make the compare work
$dbvalue = (is_numeric($value) ? (string)$value : $dbvalue);
$stored = self::get($family, $key);
if ($stored === $value) {
if ($stored === $dbvalue) {
return true;
}
if ($family === 'config') {
$a->config[$key] = $value;
$a->config[$key] = $dbvalue;
} elseif ($family != 'system') {
$a->config[$family][$key] = $value;
$a->config[$family][$key] = $dbvalue;
}
// Assign the just added value to the cache
self::$cache[$family][$key] = $value;
self::$cache[$family][$key] = $dbvalue;
// manage array value
$dbvalue = (is_array($value) ? serialize($value) : $value);
$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
if (is_null($stored)) {
$ret = q("INSERT INTO `config` (`cat`, `k`, `v`) VALUES ('%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",