diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-23 11:52:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-23 11:52:32 +0200 |
| commit | 5bd1ea0b959494bb981335c992783b69f9a9de6d (patch) | |
| tree | c5130ae2b01ca204cdc44370476fbfc2c49ca1d9 /Zotlabs/Access | |
| parent | 689ced2ac007f086ba72151c94f4d4975e3ed9de (diff) | |
| parent | 9ac67b44e42f433e34f60556e631b7573a83eb50 (diff) | |
| download | volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.tar.gz volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.tar.bz2 volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.zip | |
Merge branch 'dev' into 3.4RC
Diffstat (limited to 'Zotlabs/Access')
| -rw-r--r-- | Zotlabs/Access/PermissionLimits.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Access/PermissionRoles.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php index 125d11b7b..b8ca3034c 100644 --- a/Zotlabs/Access/PermissionLimits.php +++ b/Zotlabs/Access/PermissionLimits.php @@ -72,13 +72,13 @@ class PermissionLimits { * @param int $channel_id * @param string $perm (optional) * @return - * * \b boolean false if no perm_limits set for this channel - * * \b int if $perm is set, return one of PERMS_* constants for this permission + * * \b false if no perm_limits set for this channel + * * \b int if $perm is set, return one of PERMS_* constants for this permission, default 0 * * \b array with all permission limits, if $perm is not set */ static public function Get($channel_id, $perm = '') { if($perm) { - return PConfig::Get($channel_id, 'perm_limits', $perm); + return intval(PConfig::Get($channel_id, 'perm_limits', $perm)); } PConfig::Load($channel_id); diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php index a8a9ae462..9855a05c4 100644 --- a/Zotlabs/Access/PermissionRoles.php +++ b/Zotlabs/Access/PermissionRoles.php @@ -41,7 +41,7 @@ class PermissionRoles { break; - case 'social_party': + case 'social_federation': $ret['perms_auto'] = false; $ret['default_collection'] = false; $ret['directory_publish'] = true; @@ -281,7 +281,7 @@ class PermissionRoles { static public function roles() { $roles = [ t('Social Networking') => [ - 'social_party' => t('Social - Party'), + 'social_federation' => t('Social - Federation'), 'social' => t('Social - Mostly Public'), 'social_restricted' => t('Social - Restricted'), 'social_private' => t('Social - Private') |