From 63959a682bb636ea695543ef19bf366f693e29d7 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Tue, 25 Jun 2024 16:59:44 +0200
Subject: [PATCH] fix focus detection for non existent foki
---
metager/app/SearchSettings.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/metager/app/SearchSettings.php b/metager/app/SearchSettings.php
index 589e20c27..5cb29d897 100644
--- a/metager/app/SearchSettings.php
+++ b/metager/app/SearchSettings.php
@@ -54,16 +54,17 @@ class SearchSettings
$this->q = trim(Request::input('eingabe', ''));
$this->fokus = Request::input("focus", "web");
+ if (!in_array($this->fokus, array_merge(array_keys((array) $this->sumasJson->foki), ["maps"]))) {
+ $this->fokus = "web";
+ }
+
// Make sure sumas definition for current fokus exists
if (!property_exists($this->sumasJson->foki, $this->fokus)) {
$this->sumasJson->foki->{$this->fokus} = new \stdClass;
$this->sumasJson->foki->{$this->fokus}->sumas = [];
}
- $this->user_settings = [];
- if (!in_array($this->fokus, array_merge(array_keys((array) $this->sumasJson->foki), ["maps"]))) {
- $this->fokus = "web";
- }
+ $this->user_settings = [];
$this->javascript_enabled = filter_var($this->getSettingValue("js_available", false), FILTER_VALIDATE_BOOLEAN);
--
GitLab