Merge branch '25.02.00' into 25.02.10

Aspen-Discovery · Feb 18, 2025 · 7b90225 · 7b90225
2 parents ded7ad3 + 1bba333
commit 7b90225
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/web/release_notes/25.02.00.MD b/code/web/release_notes/25.02.00.MD
@@ -21,6 +21,7 @@
 - Display a popup message to patrons if app settings cannot be loaded when loading LiDA. (DIS-268) (*MDN*)
 - When copying .env files during the build process, check for local .env files (prefixed by the slug). (DIS-270) (*MDN*)
 - Pass app slug to Aspen Discovery as a header. (DIS-270) (*MDN*)
+- Added check to make sure `$catalog` is not null before calling `hasIlsConsentSupport()` in `Library.php`. (DIS-394) (*LS*)
 
 ## Aspen Discovery Updates
 ### Account Updates

diff --git a/code/web/sys/LibraryLocation/Library.php b/code/web/sys/LibraryLocation/Library.php
@@ -4185,7 +4185,7 @@ static function getObjectStructure($context = ''): array {
 		if (!array_key_exists('Single sign-on', $enabledModules)) {
 			unset($structure['ssoSection']);
 		}
-		if (!$catalog->hasIlsConsentSupport()) {
+		if ($catalog && !$catalog->hasIlsConsentSupport()) {
 			unset($structure['dataProtectionRegulations']['properties']['ilsConsentEnabled']);
 		}