aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-23 16:05:55 -0700
committerzotlabs <mike@macgirvin.com>2018-04-23 16:05:55 -0700
commit97308ad2fbb31ec90644e6145ec6e17bc9663c22 (patch)
tree9065534114119ad76fc31998442ad857fc1384df
parent66d72d9870ac004784484857e9369238f6cae1a9 (diff)
downloadvolse-hubzilla-97308ad2fbb31ec90644e6145ec6e17bc9663c22.tar.gz
volse-hubzilla-97308ad2fbb31ec90644e6145ec6e17bc9663c22.tar.bz2
volse-hubzilla-97308ad2fbb31ec90644e6145ec6e17bc9663c22.zip
provide a short term compatibility mapping between social_party and social_federation
-rw-r--r--Zotlabs/Module/Settings/Channel.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 3e928ec58..65b9b197e 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -21,6 +21,10 @@ class Channel {
$role = ((x($_POST,'permissions_role')) ? notags(trim($_POST['permissions_role'])) : '');
$oldrole = get_pconfig(local_channel(),'system','permissions_role');
+ // This mapping can be removed after 3.4 release
+ if($oldrole === 'social_party') {
+ $oldrole = 'social_federation';
+ }
if(($role != $oldrole) || ($role === 'custom')) {
@@ -471,6 +475,10 @@ class Channel {
$permissions_role = get_pconfig(local_channel(),'system','permissions_role');
if(! $permissions_role)
$permissions_role = 'custom';
+ // compatibility mapping - can be removed after 3.4 release
+ if($permissions_role === 'social_party')
+ $permissions_role = 'social_federation';
+
$permissions_set = (($permissions_role != 'custom') ? true : false);