TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'six' of https://framagit.org/hubzilla/core into six

Browse Source
This commit is contained in:
Mario Vavti
2021-06-02 09:42:27 +02:00
parent b3df15a3c6 baabb3a873
commit 2ec2da5dff
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/Libzot.php
View File

@@ -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);

4
Zotlabs/Module/Admin/Site.php
View File

@@ -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',

1
boot.php
View File

@@ -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' );

1
include/help.php
View File

@@ -2,6 +2,7 @@
use \Michelf\MarkdownExtra;
require_once('include/items.php');
/**
* @brief