Merge pull request #949 from Aspen-Discovery/24.09.00

[pull] 24.09.00 from Aspen-Discovery:24.09.00
Aspen-Discovery · Aug 22, 2024 · 73b2d4b · 73b2d4b
2 parents c6d982e + 52146e5
commit 73b2d4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/code/koha_export/koha_export.jar b/code/koha_export/koha_export.jar
diff --git a/code/web/release_notes/24.09.00.MD b/code/web/release_notes/24.09.00.MD
@@ -46,7 +46,7 @@
 </div>
 
 ### Sierra Updates
-- Update Sierra Driver to handle checkouts by API 
+- Update Sierra Driver to handle checkouts by API. (*MDN-G*)
 
 ### WebBuilder Updates
 - Do not allow titles for cells to be locked. (AD-8) (*MDN-G*)
@@ -55,6 +55,7 @@
 - Do not apply field locks to new objects. (AD-7) (*MDN-G*)
 - Setup a system so some fields can be prevented from being locked. (AD-8) (*MDN-G*)
 - Ignore local IntelliJ and PhpStorm Projects. (*MDN-G*)
+- Suppress warnings when deserializing details to show in search results for Grouped Work Display Settings. (*MDN-G*)
 
 // katherine
 ### Indexing Updates

diff --git a/code/web/sys/Grouping/GroupedWorkDisplaySetting.php b/code/web/sys/Grouping/GroupedWorkDisplaySetting.php
@@ -697,7 +697,7 @@ public function fetch() {
 		if ($return) {
 			if (isset($this->showInSearchResultsMainDetails) && is_string($this->showInSearchResultsMainDetails) && !empty($this->showInSearchResultsMainDetails)) {
 				// convert to array retrieving from database
-				$unSerialized = unserialize($this->showInSearchResultsMainDetails);
+				$unSerialized = @unserialize($this->showInSearchResultsMainDetails);
 				if (!empty($unSerialized)) {
 					$this->showInSearchResultsMainDetails = array_combine($unSerialized, $unSerialized);
 					if (!$this->showInSearchResultsMainDetails) {