From 3fe2a2b181ec2f96b5950560fc50859d6b3ff78a Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 31 May 2021 07:12:36 +0000
Subject: do not overwrite the original rawmsg iconfig that came with the item

---
 Zotlabs/Lib/Libzot.php | 4 ----
 include/help.php       | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index b04c0ea3c..d5768cc84 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1270,10 +1270,6 @@ class Libzot {
 
 				if ($AS->data['signed_data']) {
 					IConfig::Set($arr, 'activitypub', 'signed_data', $AS->data['signed_data'], false);
-					$j = json_decode($AS->data['signed_data'], true);
-					if ($j) {
-						IConfig::Set($arr, 'activitypub', 'rawmsg', json_encode(JSalmon::unpack($j['data'])), true);
-					}
 				}
 
 				logger('Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
diff --git a/include/help.php b/include/help.php
index 38facb04a..6daf81b8e 100644
--- a/include/help.php
+++ b/include/help.php
@@ -2,6 +2,7 @@
 
 use \Michelf\MarkdownExtra;
 
+require_once('include/items.php');
 
 /**
  * @brief
-- 
cgit v1.2.3


From 5ee1c3f2c8590caa70ec34046ef5c75dacac3642 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 31 May 2021 10:03:34 +0200
Subject: include items.php in boot since it is required almost everywhere

---
 boot.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot.php b/boot.php
index f51abe2f8..bb2d094ea 100644
--- a/boot.php
+++ b/boot.php
@@ -50,6 +50,7 @@ require_once('include/xchan.php');
 require_once('include/hubloc.php');
 require_once('include/attach.php');
 require_once('include/bbcode.php');
+require_once('include/items.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '5.9.0' );
-- 
cgit v1.2.3


From baabb3a8730708634385abdb366a45c6e234e154 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 31 May 2021 10:14:26 +0200
Subject: fix admin button state not displayed correctly

---
 Zotlabs/Module/Admin/Site.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index 3b2632411..76e117a84 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -480,12 +480,12 @@ class Site {
 			'$invitation_only' => [
 				'invitation_only',
 				t("Require invite code"),
-				$invitation_only
+				get_config('system', 'invitation_only', 0)
 			],
 			'$invitation_also' => [
 				'invitation_also',
 				t("Allow invite code"),
-				$invitation_also
+				get_config('system', 'invitation_also', 0)
 			],
 			'$verify_email'		=> [
 				'verify_email',
-- 
cgit v1.2.3