aboutsummaryrefslogtreecommitdiffstats
path: root/include/config.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-26 11:59:19 +0200
committerMichael <icarus@dabo.de>2012-05-26 11:59:19 +0200
commit7b3c02057db47a627b56bdd79f1055ea7f876617 (patch)
tree8c9b11fa72e544aea721f385b40bff7254e42ed2 /include/config.php
parent6342b3e0bdd5774857a8fca809994f05e0208d25 (diff)
parentf5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff)
downloadvolse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.gz
volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.bz2
volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.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' ) ",