aboutsummaryrefslogtreecommitdiffstats
path: root/include/config.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-05-25 16:19:10 +0200
committerMichael Vogel <icarus@dabo.de>2012-05-25 16:19:10 +0200
commita71e3134bf7250b60cafd1e51098eea70c3459de (patch)
tree456f59d30e5f4b8d22f4bfdac0c55e7323cd0427 /include/config.php
parent8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f (diff)
parentd1345e505406b1a1cdc3fc26a1734916c8abc89d (diff)
downloadvolse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.gz
volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.bz2
volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.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 e416bec6e..6edc3f286 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' ) ",