diff options
author | Mike Macgirvin <mike@macgirvin.com> | 2018-04-21 19:09:27 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-21 19:09:27 +1000 |
commit | 5a736d338b1c0aa1671d34ff724c2649ccf7e1e7 (patch) | |
tree | 5cecf97e3da35d2f5a465043e5a0b8193275e98e | |
parent | 92b08f1f07a25976342dc885331ecb1531e256aa (diff) | |
parent | 1bb67f63e37a10b9bcf5c6ea1d0d4ae431b00cab (diff) | |
download | volse-hubzilla-5a736d338b1c0aa1671d34ff724c2649ccf7e1e7.tar.gz volse-hubzilla-5a736d338b1c0aa1671d34ff724c2649ccf7e1e7.tar.bz2 volse-hubzilla-5a736d338b1c0aa1671d34ff724c2649ccf7e1e7.zip |
Merge pull request #1099 from zotlabs/dev
This is important
-rw-r--r-- | Zotlabs/Access/PermissionLimits.php | 4 | ||||
-rw-r--r-- | Zotlabs/Update/_1212.php | 26 | ||||
-rwxr-xr-x | boot.php | 2 |
3 files changed, 28 insertions, 4 deletions
diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php index 1d15098fc..eb660ead9 100644 --- a/Zotlabs/Access/PermissionLimits.php +++ b/Zotlabs/Access/PermissionLimits.php @@ -41,10 +41,8 @@ class PermissionLimits { $limits = []; $perms = Permissions::Perms(); - $anon_comments = get_config('system','anonymous_comments',true); - foreach($perms as $k => $v) { - if(strstr($k, 'view') || ($k === 'post_comments' && $anon_comments)) + if(strstr($k, 'view')) $limits[$k] = PERMS_PUBLIC; else $limits[$k] = PERMS_SPECIFIC; diff --git a/Zotlabs/Update/_1212.php b/Zotlabs/Update/_1212.php new file mode 100644 index 000000000..f15ba8a71 --- /dev/null +++ b/Zotlabs/Update/_1212.php @@ -0,0 +1,26 @@ +<?php + +namespace Zotlabs\Update; + +class _1212 { + + function run() { + + $r = q("select channel_id from channel where true"); + if($r) { + foreach($r as $rv) { + $role = get_pconfig($rv['channel_id'],'system','permissions_role'); + if($role !== 'custom') { + $role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($role); + if(array_key_exists('limits',$role_permissions) && array_key_exists('post_comments',$role_permissions['limits'])) { + set_pconfig($rv['channel_id'],'perm_limits','post_comments',$role_permissions['limits']['post_comments']); + } + } + } + } + + return UPDATE_SUCCESS; + + } + +} @@ -54,7 +54,7 @@ define ( 'STD_VERSION', '3.5' ); define ( 'ZOT_REVISION', '6.0a' ); -define ( 'DB_UPDATE_VERSION', 1211 ); +define ( 'DB_UPDATE_VERSION', 1212 ); define ( 'PROJECT_BASE', __DIR__ ); |