diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 23:32:16 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 23:32:16 -0400 |
| commit | afe7f09b278bca546f606a6ce54707a853cddf47 (patch) | |
| tree | ad54ff6a49e503a0218a301ef8e362fb6e08c6ea /include | |
| parent | c0a18bc2fad021db026141b732b3e9a1e0ce1d71 (diff) | |
| parent | d509a463452585bcbb9fccd07857871ca5c8b063 (diff) | |
| download | volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.tar.gz volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.tar.bz2 volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
correct some filer dialog weirdness caused by introduction of categories
move alert box away from nav links
log disabled requests
fix config storage of booleans
* master:
Diffstat (limited to 'include')
| -rwxr-xr-x | include/config.php | 1 | ||||
| -rwxr-xr-x | include/diaspora.php | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/config.php b/include/config.php index 2cddda0b8..4cff38090 100755 --- a/include/config.php +++ b/include/config.php @@ -80,6 +80,7 @@ function set_config($family,$key,$value) { // manage array value $dbvalue = (is_array($value)?serialize($value):$value); + $dbvalue = (is_bool($value) ? intval($value) : $value); if(get_config($family,$key,true) === false) { $a->config[$family][$key] = $value; diff --git a/include/diaspora.php b/include/diaspora.php index 9951cf423..37d5990ee 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -10,8 +10,10 @@ require_once('include/queue_fn.php'); function diaspora_dispatch_public($msg) { $enabled = intval(get_config('system','diaspora_enabled')); - if(! $enabled) + if(! $enabled) { + logger('mod-diaspora: disabled'); return; + } $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ", dbesc(NETWORK_DIASPORA), @@ -34,8 +36,10 @@ function diaspora_dispatch($importer,$msg) { $ret = 0; $enabled = intval(get_config('system','diaspora_enabled')); - if(! $enabled) + if(! $enabled) { + logger('mod-diaspora: disabled'); return; + } // php doesn't like dashes in variable names |