keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* 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:
This commit is contained in:
Simon L'nu 2012-04-04 23:32:16 -04:00
commit afe7f09b27
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config.php
View file

@ -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;

8
include/diaspora.php
View file

@ -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

3
mod/filer.php
View file

@ -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 -')),

5
view/theme/duepuntozero/style.css
View file

@ -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;