From 2b4a6c7dd723c404a48b629766279c24b45f54b4 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 15 Dec 2015 11:51:16 +0100 Subject: [PATCH] Don't check Link header if not set --- plugins/Linkback/LinkbackPlugin.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/Linkback/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php index 0ab76f1d53..941e7c4c4b 100644 --- a/plugins/Linkback/LinkbackPlugin.php +++ b/plugins/Linkback/LinkbackPlugin.php @@ -141,13 +141,16 @@ class LinkbackPlugin extends Plugin // Based on https://github.com/indieweb/mention-client-php // which is licensed Apache 2.0 function getWebmention($result) { - // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers - if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) { - return $match[1]; - } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) { - return $match[1]; + if (isset($result->headers['Link'])) { + // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers + if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) { + return $match[1]; + } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) { + return $match[1]; + } } + // FIXME: Do proper DOM traversal if(preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]*\/?>/i', $result->body, $match) || preg_match('/<(?:link|a)[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]+href="([^"]+)"[ ]*\/?>/i', $result->body, $match)) { return $match[1];