Merge branch 'main' into issue-3911issue-3911

11 files changed, 4 insertions, 5 deletions

diff --git a/lib/classes/librarysearch/LibraryDocument.class.php b/lib/classes/librarysearch/LibraryDocument.php
index 4c90e0b4..c1d297e 100644
--- a/lib/classes/librarysearch/LibraryDocument.class.php
+++ b/lib/classes/librarysearch/LibraryDocument.php
@@ -14,7 +14,6 @@
  * @since       4.6
  */
 
-
 /**
  * This class represents a document from a library.
  */
@@ -322,8 +321,8 @@ class LibraryDocument
         $doc->csl_data = $data['csl_data'];
         $doc->datafields = $data['datafields'];
         $doc->search_params = $data['search_params'];
-        $doc->catalog = $data['catalog'];
-        $doc->opac_link = $data['opac_link'];
+        $doc->catalog = $data['catalog'] ?? null;
+        $doc->opac_link = $data['opac_link'] ?? null;
         return $doc;
     }
 
@@ -386,12 +385,12 @@ class LibraryDocument
 
 
     /**
-     * @returns Flexi_Template A template containing information about the
+     * @returns Flexi\Template A template containing information about the
      *     the document.
      */
     public function getInfoTemplate($format = 'short')
     {
-        $factory = new Flexi_TemplateFactory(
+        $factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/templates/library/'
         );
         $template = $factory->open('library_document_info');
diff --git a/lib/classes/librarysearch/LibraryResultParser.interface.php b/lib/classes/librarysearch/LibraryResultParser.php
index eae45a4..eae45a4 100644
--- a/lib/classes/librarysearch/LibraryResultParser.interface.php
+++ b/lib/classes/librarysearch/LibraryResultParser.php
diff --git a/lib/classes/librarysearch/LibrarySearch.class.php b/lib/classes/librarysearch/LibrarySearch.php
index 473eacf..473eacf 100644
--- a/lib/classes/librarysearch/LibrarySearch.class.php
+++ b/lib/classes/librarysearch/LibrarySearch.php
diff --git a/lib/classes/librarysearch/LibrarySearchManager.class.php b/lib/classes/librarysearch/LibrarySearchManager.php
index ee9dc75..ee9dc75 100644
--- a/lib/classes/librarysearch/LibrarySearchManager.class.php
+++ b/lib/classes/librarysearch/LibrarySearchManager.php
diff --git a/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.php
index b92628f..b92628f 100644
--- a/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.class.php
+++ b/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.php
diff --git a/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.php
index b4b3a20..b4b3a20 100644
--- a/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.class.php
+++ b/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.php
diff --git a/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.php
index 8017f3d..8017f3d 100644
--- a/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.class.php
+++ b/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.php
diff --git a/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.php
index fed92f3..fed92f3 100644
--- a/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.class.php
+++ b/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.php
diff --git a/lib/classes/librarysearch/searchmodules/BASELibrarySearch.class.php b/lib/classes/librarysearch/searchmodules/BASELibrarySearch.php
index e0408e7..e0408e7 100644
--- a/lib/classes/librarysearch/searchmodules/BASELibrarySearch.class.php
+++ b/lib/classes/librarysearch/searchmodules/BASELibrarySearch.php
diff --git a/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.class.php b/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.php
index 9660cb4..9660cb4 100644
--- a/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.class.php
+++ b/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.php
diff --git a/lib/classes/librarysearch/searchmodules/SRULibrarySearch.class.php b/lib/classes/librarysearch/searchmodules/SRULibrarySearch.php
index b94869a..b94869a 100644
--- a/lib/classes/librarysearch/searchmodules/SRULibrarySearch.class.php
+++ b/lib/classes/librarysearch/searchmodules/SRULibrarySearch.php