aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-01 20:30:47 -0800
committerfriendica <info@friendica.com>2015-02-01 20:30:47 -0800
commitaafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (patch)
tree66b27325cd7bcce748965aebb29ab8a1da2f340d /include
parente6a5f7800390e5091743d6a97c6fd8f54c5d1530 (diff)
parente58bef049d7736d448f7bb5688affe491b9e24b1 (diff)
downloadvolse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.tar.gz
volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.tar.bz2
volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.zip
Merge branch 'master' into tres
Diffstat (limited to 'include')
-rwxr-xr-xinclude/diaspora.php2
-rw-r--r--include/poller.php4
-rw-r--r--include/text.php1
3 files changed, 6 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 82a59a73f..447fd363a 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -688,7 +688,7 @@ function diaspora_request($importer,$xml) {
$default_perms = $x['perms_accept'];
}
if(! $default_perms)
- $default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
+ $default_perms = intval(get_pconfig($importer['channel_id'],'system','autoperms'));
$their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES;
diff --git a/include/poller.php b/include/poller.php
index b21919b3d..2756ca1c6 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -163,6 +163,10 @@ function poller_run($argv, $argc){
db_utcnow(), db_quoteinterval('14 DAY')
);
+ $dirmode = intval(get_config('system','directory_mode'));
+ if($dirmode == DIRECTORY_MODE_SECONDARY) {
+ logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . z_root() . '&realm=' . get_directory_realm()),true));
+ }
/**
* End Cron Weekly
diff --git a/include/text.php b/include/text.php
index c3336852e..6c3bb3017 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2387,6 +2387,7 @@ function getIconFromType($type) {
$iconMap = array(
//Folder
t('Collection') => 'icon-folder-close',
+ 'multipart/mixed' => 'icon-folder-close', //dirs in attach use this mime type
//Common file
'application/octet-stream' => 'icon-file-alt',
//Text