aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2021-06-02 09:42:27 +0200
committerMario Vavti <mario@mariovavti.com>2021-06-02 09:42:27 +0200
commit2ec2da5dff1f8be28c6f625a37295a9410d35593 (patch)
treeddb50222c25381e13e91b999667a106f7520ea7e /Zotlabs
parentb3df15a3c6e017ce3858ee484c6d2d70a5f18a17 (diff)
parentbaabb3a8730708634385abdb366a45c6e234e154 (diff)
downloadvolse-hubzilla-2ec2da5dff1f8be28c6f625a37295a9410d35593.tar.gz
volse-hubzilla-2ec2da5dff1f8be28c6f625a37295a9410d35593.tar.bz2
volse-hubzilla-2ec2da5dff1f8be28c6f625a37295a9410d35593.zip
Merge branch 'six' of https://framagit.org/hubzilla/core into six
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Libzot.php4
-rw-r--r--Zotlabs/Module/Admin/Site.php4
2 files changed, 2 insertions, 6 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/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',