aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2018-04-21 19:09:27 +1000
committerGitHub <noreply@github.com>2018-04-21 19:09:27 +1000
commit5a736d338b1c0aa1671d34ff724c2649ccf7e1e7 (patch)
tree5cecf97e3da35d2f5a465043e5a0b8193275e98e /Zotlabs
parent92b08f1f07a25976342dc885331ecb1531e256aa (diff)
parent1bb67f63e37a10b9bcf5c6ea1d0d4ae431b00cab (diff)
downloadvolse-hubzilla-5a736d338b1c0aa1671d34ff724c2649ccf7e1e7.tar.gz
volse-hubzilla-5a736d338b1c0aa1671d34ff724c2649ccf7e1e7.tar.bz2
volse-hubzilla-5a736d338b1c0aa1671d34ff724c2649ccf7e1e7.zip
Merge pull request #1099 from zotlabs/dev
This is important
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Access/PermissionLimits.php4
-rw-r--r--Zotlabs/Update/_1212.php26
2 files changed, 27 insertions, 3 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;
+
+ }
+
+}