From 220f70d54b93f54ce7f0b939519ef3d037e5dfdc Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Mon, 7 Nov 2016 15:03:48 +0000 Subject: [PATCH] =?UTF-8?q?trim=20angle=20brackets,=20fix=20getScheme()=20?= =?UTF-8?q?check,=20it=20doesn=E2=80=99t=20return=20null,=20but=20an=20emp?= =?UTF-8?q?ty=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/SendWebMentions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/SendWebMentions.php b/app/Jobs/SendWebMentions.php index cd593e56..41bd499b 100644 --- a/app/Jobs/SendWebMentions.php +++ b/app/Jobs/SendWebMentions.php @@ -75,7 +75,7 @@ class SendWebMentions implements ShouldQueue $links = \GuzzleHttp\Psr7\parse_header($response->getHeader('Link')); foreach ($links as $link) { if (mb_stristr($link['rel'], 'webmention')) { - return $this->resolveUri($link[0], $url); + return $this->resolveUri(trim($link[0], '<>'), $url); } } @@ -125,7 +125,7 @@ class SendWebMentions implements ShouldQueue public function resolveUri(string $url, string $base): string { $endpoint = \GuzzleHttp\Psr7\uri_for($url); - if ($endpoint->getScheme() !== null) { + if ($endpoint->getScheme() != '') { return (string) $endpoint; }