clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13709 from friendica/MrPetovan-patch-1 

Add support for string in $nodeinfo['protocols']
This commit is contained in:
Michael Vogel 2023-12-10 19:59:38 +01:00 committed by GitHub
parent dc9658f532 35e3e912df
commit 2643ca11e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/GServer.php
View File

@ -1266,11 +1266,15 @@ class GServer
if (!empty($nodeinfo['protocols'])) { if (!empty($nodeinfo['protocols'])) {
$protocols = []; $protocols = [];
if (is_string($nodeinfo['protocols'])) {
$protocols[$nodeinfo['protocols']] = true;
} else {
foreach ($nodeinfo['protocols'] as $protocol) { foreach ($nodeinfo['protocols'] as $protocol) {
if (is_string($protocol)) { if (is_string($protocol)) {
$protocols[$protocol] = true; $protocols[$protocol] = true;
} }
} }
}
if (!empty($protocols['dfrn'])) { if (!empty($protocols['dfrn'])) {
$server['network'] = Protocol::DFRN; $server['network'] = Protocol::DFRN;
@ -1367,11 +1371,15 @@ class GServer
if (!empty($nodeinfo['protocols'])) { if (!empty($nodeinfo['protocols'])) {
$protocols = []; $protocols = [];
if (is_string($nodeinfo['protocols'])) {
$protocols[$nodeinfo['protocols']] = true;
} else {
foreach ($nodeinfo['protocols'] as $protocol) { foreach ($nodeinfo['protocols'] as $protocol) {
if (is_string($protocol)) { if (is_string($protocol)) {
$protocols[$protocol] = true; $protocols[$protocol] = true;
} }
} }
}
if (!empty($protocols['dfrn'])) { if (!empty($protocols['dfrn'])) {
$server['network'] = Protocol::DFRN; $server['network'] = Protocol::DFRN;