aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Settings/Channel.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-29 16:00:54 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-29 16:00:54 +0200
commit8265dac9c0127c55c378094b5ccceddc1d66bea4 (patch)
treec94c4a57240d1c42bfcec2f32fac9b6fd7238570 /Zotlabs/Module/Settings/Channel.php
parent6eeac03a0e42ae88218b76948aedfa541022718c (diff)
parentba4a8aa7623038fd9926b58d826e7cb733176b48 (diff)
downloadvolse-hubzilla-8265dac9c0127c55c378094b5ccceddc1d66bea4.tar.gz
volse-hubzilla-8265dac9c0127c55c378094b5ccceddc1d66bea4.tar.bz2
volse-hubzilla-8265dac9c0127c55c378094b5ccceddc1d66bea4.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Settings/Channel.php')
-rw-r--r--Zotlabs/Module/Settings/Channel.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 73cb4decb..c473a70a4 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -432,7 +432,7 @@ class Channel {
'$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . '&nbsp;(' . $webbie . ')'),
'$subdir' => $subdir,
'$davdesc' => t('Your files/photos are accessible via WebDAV at'),
- '$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''),
+ '$davpath' => z_root() . '/dav/' . $nickname,
'$basepath' => \App::get_hostname()
));
@@ -490,11 +490,6 @@ class Channel {
$permissions_set = (($permissions_role != 'custom') ? true : false);
$perm_roles = \Zotlabs\Access\PermissionRoles::roles();
- if((get_account_techlevel() < 4) && $permissions_role !== 'custom')
- unset($perm_roles[t('Other')]);
-
-
-
$vnotify = get_pconfig(local_channel(),'system','vnotify');
$always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices');