From 0dfd3fc42f437a8709ebb58ecedca167500aab00 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 27 Jun 2024 14:17:37 +0200
Subject: [PATCH] merge searchengine settings the other way around
---
metager/app/Models/SearchengineConfiguration.php | 4 ++--
metager/app/Models/parserSkripte/BraveNews.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/metager/app/Models/SearchengineConfiguration.php b/metager/app/Models/SearchengineConfiguration.php
index e48d6b09a..753462244 100644
--- a/metager/app/Models/SearchengineConfiguration.php
+++ b/metager/app/Models/SearchengineConfiguration.php
@@ -177,7 +177,7 @@ class SearchengineConfiguration
if ($this->requestHeader === null) {
$this->requestHeader = new \stdClass;
}
- $this->requestHeader = (object) array_merge((array) $this->requestHeader, (array) $requestHeader);
+ $this->requestHeader = (object) array_merge((array) $requestHeader, (array) $this->requestHeader);
}
public function addQueryParameters(object|array $queryParameters)
@@ -188,7 +188,7 @@ class SearchengineConfiguration
if ($this->getParameter === null) {
$this->getParameter = new \stdClass;
}
- $this->getParameter = (object) array_merge((array) $this->getParameter, (array) $queryParameters);
+ $this->getParameter = (object) array_merge((array) $queryParameters, (array) $this->getParameter);
}
public function applyQuery(string $query)
diff --git a/metager/app/Models/parserSkripte/BraveNews.php b/metager/app/Models/parserSkripte/BraveNews.php
index 06f03c657..ae34a6dfa 100644
--- a/metager/app/Models/parserSkripte/BraveNews.php
+++ b/metager/app/Models/parserSkripte/BraveNews.php
@@ -145,7 +145,7 @@ class BraveNews extends Searchengine
try {
$results = json_decode($result);
- if (!$results->query->more_results_available) {
+ if (sizeof($results->results) === 0) {
return;
}
--
GitLab