aboutsummaryrefslogtreecommitdiffstats
path: root/include/config.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-23 18:25:58 +0200
committerzottel <github@zottel.net>2012-05-23 18:25:58 +0200
commit3aa516ccabc9bb09ae30ffa2d3657fba36699ea9 (patch)
tree93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /include/config.php
parente9c86c0fd0fb87b49e60669e6d4be810ca426ec4 (diff)
parent61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff)
downloadvolse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.tar.gz
volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.tar.bz2
volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/config.php')
-rw-r--r--include/config.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/config.php b/include/config.php
index 4cff38090..12fc9cafc 100644
--- a/include/config.php
+++ b/include/config.php
@@ -77,11 +77,9 @@ function get_config($family, $key, $instore = false) {
if(! function_exists('set_config')) {
function set_config($family,$key,$value) {
global $a;
-
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
- $dbvalue = (is_bool($value) ? intval($value) : $value);
-
+ $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
if(get_config($family,$key,true) === false) {
$a->config[$family][$key] = $value;
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",