From b12d254427135bc3313f22163e9c3f4c42e68076 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 20 Apr 2018 15:03:16 -0700
Subject: fix any misconfigured channel permission limits

---
 Zotlabs/Update/_1212.php | 26 ++++++++++++++++++++++++++
 boot.php                 |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 Zotlabs/Update/_1212.php

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;
+
+	}
+
+}
diff --git a/boot.php b/boot.php
index aa6fe7b99..eb2c1ddff 100755
--- a/boot.php
+++ b/boot.php
@@ -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__ );
 
-- 
cgit v1.2.3


From 1bb67f63e37a10b9bcf5c6ea1d0d4ae431b00cab Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 20 Apr 2018 14:38:15 -0700
Subject: anonymous comments shouldn't be allowed in StdLimits

---
 Zotlabs/Access/PermissionLimits.php | 4 +---
 1 file changed, 1 insertion(+), 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;
-- 
cgit v1.2.3


From c446ffb814cda9776b69529df317e0ede6b5398b Mon Sep 17 00:00:00 2001
From: Jeroen <jeroenpraat@users.noreply.github.com>
Date: Sun, 22 Apr 2018 20:16:04 +0200
Subject: back to only nickname

---
 doc/about/project.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/about/project.bb b/doc/about/project.bb
index f9bc920f8..fe90b4d36 100644
--- a/doc/about/project.bb
+++ b/doc/about/project.bb
@@ -116,7 +116,7 @@ even if we have had our occasional disagreements.
 [li]Simon[/li]
 [li]zottel[/li]
 [li]Christian Vogeley[/li]
-[li]Jeroen van Riet Paap (jeroenpraat)[/li]
+[li]jeroenpraat[/li]
 [li]Michael Vogel[/li]
 [li]erik[/li]
 [li]Zach Prezkuta[/li]
-- 
cgit v1.2.3