GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[OStatus] null being returned instead of an empty array

Browse Source 
Fixes: "Invalid argument supplied for foreach" in onEndFindMentions
This commit is contained in:
Diogo Cordeiro 2019-07-10 00:10:18 +01:00
parent 5ea0d74a57
commit db9bb6b5a1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/OStatus/OStatusPlugin.php
View File

@ -30,7 +30,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
class OStatusPlugin extends Plugin class OStatusPlugin extends Plugin
{ {
const PLUGIN_VERSION = '2.0.1'; const PLUGIN_VERSION = '2.0.2';
/** /**
* Hook for RouterInitialized event. * Hook for RouterInitialized event.
@ -274,6 +274,7 @@ class OStatusPlugin extends Plugin
PREG_OFFSET_CAPTURE); PREG_OFFSET_CAPTURE);
if ($result === false) { if ($result === false) {
common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').'); common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').');
return [];
} elseif (count($wmatches)) { } elseif (count($wmatches)) {
common_debug(sprintf('Found %d matches for WebFinger IDs: %s', count($wmatches), _ve($wmatches))); common_debug(sprintf('Found %d matches for WebFinger IDs: %s', count($wmatches), _ve($wmatches)));
} }
@ -298,6 +299,7 @@ class OStatusPlugin extends Plugin
PREG_OFFSET_CAPTURE); PREG_OFFSET_CAPTURE);
if ($result === false) { if ($result === false) {
common_log(LOG_ERR, __METHOD__ . ': Error parsing profile URL mentions from text (preg_last_error=='.preg_last_error().').'); common_log(LOG_ERR, __METHOD__ . ': Error parsing profile URL mentions from text (preg_last_error=='.preg_last_error().').');
return [];
} elseif (count($wmatches)) { } elseif (count($wmatches)) {
common_debug(sprintf('Found %d matches for profile URL mentions: %s', count($wmatches), _ve($wmatches))); common_debug(sprintf('Found %d matches for profile URL mentions: %s', count($wmatches), _ve($wmatches)));
} }
@ -593,7 +595,7 @@ class OStatusPlugin extends Plugin
try { try {
$url = $notice->getUrl(); $url = $notice->getUrl();
// If getUrl() throws exception, $url is never set // If getUrl() throws exception, $url is never set
$bits = parse_url($url); $bits = parse_url($url);
$domain = $bits['host']; $domain = $bits['host'];
if (substr($domain, 0, 4) == 'www.') { if (substr($domain, 0, 4) == 'www.') {