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:

4 files changed, 13 insertions, 4 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
 
diff --git a/mod/filer.php b/mod/filer.php
index 3cd1bfe22..c0cca9e6d 100755
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -22,7 +22,8 @@ function filer_content(&$a) {
 	} else {
 		// return filer dialog
 		$filetags = get_pconfig(local_user(),'system','filetags');
-		$filetags = explode("][", trim($filetags,"[]"));
+		$filetags = file_tag_file_to_list($filetags,'file');
+                $filetags = explode(",", $filetags);
 		$tpl = get_markup_template("filer_dialog.tpl");
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 38c1fc5bd..c30e643ce 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2987,7 +2987,10 @@ div.jGrowl div.info {
   color: #ffffff;
   padding-left: 58px;
 }
-
+#jGrowl.top-right {
+	top: 15px;
+	right: 15px;
+}
 .qcomment {
 	border: 1px solid #EEE;
 	padding: 3px;