From 1a5b47a1080757170bf8aef9a138b2e02e85c487 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Sat, 22 Apr 2017 12:09:19 -0500 Subject: [PATCH] Account for differences in 3.x and 4.x HTTP client --- .../com_patchtester/PatchTester/Model/PullsModel.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php b/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php index e1cfe9d..cf405c6 100644 --- a/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php +++ b/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php @@ -344,7 +344,15 @@ class PullsModel extends \JModelDatabase if (isset($pullsResponse->headers['Link'])) { - preg_match('/(\?page=[0-9]&per_page=' . $batchSize . '+>; rel=\"last\")/', $pullsResponse->headers['Link'], $matches); + $linkHeader = $pullsResponse->headers['Link']; + + // The `joomla/http` 2.0 package uses PSR-7 Responses which has a different format for headers, check for this + if (is_array($linkHeader)) + { + $linkHeader = $linkHeader[0]; + } + + preg_match('/(\?page=[0-9]&per_page=' . $batchSize . '+>; rel=\"last\")/', $linkHeader, $matches); if ($matches && isset($matches[0])) {