From: Diogo Cordeiro Date: Tue, 9 Jul 2019 23:10:18 +0000 (+0100) Subject: [OStatus] null being returned instead of an empty array X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=db9bb6b5a1a2fd1bb72484d31c2939fb2b4d5f5c;p=quix0rs-gnu-social.git [OStatus] null being returned instead of an empty array Fixes: "Invalid argument supplied for foreach" in onEndFindMentions --- diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index afbfa487d3..615a01bd7e 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -30,7 +30,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } class OStatusPlugin extends Plugin { - const PLUGIN_VERSION = '2.0.1'; + const PLUGIN_VERSION = '2.0.2'; /** * Hook for RouterInitialized event. @@ -274,6 +274,7 @@ class OStatusPlugin extends Plugin PREG_OFFSET_CAPTURE); if ($result === false) { common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').'); + return []; } elseif (count($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); if ($result === false) { common_log(LOG_ERR, __METHOD__ . ': Error parsing profile URL mentions from text (preg_last_error=='.preg_last_error().').'); + return []; } elseif (count($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 { $url = $notice->getUrl(); // If getUrl() throws exception, $url is never set - + $bits = parse_url($url); $domain = $bits['host']; if (substr($domain, 0, 4) == 'www.') {