From 950577208735269dae7ac38a2021373f5f6436e1 Mon Sep 17 00:00:00 2001 From: Alexander Blanchard Date: Tue, 4 Jun 2024 15:49:22 +0100 Subject: [PATCH 1/2] revert: revert changes to 24.06.00 file Removed changes to file that relate to a split out pull request --- code/web/sys/DBMaintenance/version_updates/24.06.00.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/web/sys/DBMaintenance/version_updates/24.06.00.php b/code/web/sys/DBMaintenance/version_updates/24.06.00.php index 90c221c104..50010290b5 100644 --- a/code/web/sys/DBMaintenance/version_updates/24.06.00.php +++ b/code/web/sys/DBMaintenance/version_updates/24.06.00.php @@ -81,14 +81,6 @@ function getUpdates24_06_00(): array { //other - //alexander - PTFS Europe - 'explore_more_section_control' => [ - 'title' => 'Explore More Section Control', - 'description' => 'Allow control over whether the Explore More Section is displayed', - 'sql' => [ - "ALTER TABLE layout_settings ADD COLUMN showExploreMoreOptions TINYINT DEFAULT '1'", - ] - ],//control_whether_the_explore_more_box_is_displayed ]; From 9fea3cbac0f9195e13df1d5c14214fb2f7638eb5 Mon Sep 17 00:00:00 2001 From: Alexander Blanchard Date: Tue, 4 Jun 2024 18:00:05 +0100 Subject: [PATCH 2/2] fix: add check to prevent undefined index error --- code/web/sys/SearchObject/SummonSearcher.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/web/sys/SearchObject/SummonSearcher.php b/code/web/sys/SearchObject/SummonSearcher.php index cc12ca2d04..ee8dc6d44a 100644 --- a/code/web/sys/SearchObject/SummonSearcher.php +++ b/code/web/sys/SearchObject/SummonSearcher.php @@ -517,10 +517,12 @@ public function getLimitList() { foreach($limitOption['counts'] as $value){ if ($value['value'] == 'true') { + $isApplied = isset($this->limiters[$limitId]) && $this->limiters[$limitId] == 'y' ? 1 : 0; + $availableLimits[$limitId] = [ 'display' => $displayName, 'value' => $limitId, - 'isApplied' => ($this->limiters[$limitId]) == 'y' ? 1 : 0, + 'isApplied' => $isApplied, 'url' => $this->renderLinkWithLimiter($limitId), 'removalUrl' => $this->renderLinkWithoutLimiter($limitId), ];