Merge branch 'release-3.1'

module/VuFind/sql/migrations/pgsql/3.0/004-modify-seach-columns.sql

@@ -3,5 +3,7 @@
 --
 
 ALTER TABLE "search"
-  ALTER COLUMN created TYPE timestamp NOT NULL SET DEFAULT '1970-01-01 00:00:00',
-  ADD COLUMN checksum int DEFAULT NULL;
+   ALTER COLUMN created TYPE timestamp,
+   ALTER COLUMN created SET NOT NULL,
+   ALTER COLUMN created SET DEFAULT '1970-01-01 00:00:00',
+   ADD COLUMN checksum int DEFAULT NULL;

module/VuFind/src/VuFind/Auth/Shibboleth.php

@@ -256,7 +256,10 @@ class Shibboleth extends AbstractBase
         if (isset($config->Shibboleth->logout)
             && !empty($config->Shibboleth->logout)
         ) {
-            $url = $config->Shibboleth->logout . '?return=' . urlencode($url);
+            $append = (strpos($config->Shibboleth->logout, '?') !== false) ? '&'
+                : '?';
+            $url = $config->Shibboleth->logout . $append . 'return='
+                . urlencode($url);
         }
 
         // Send back the redirect URL (possibly modified):

module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php

@@ -704,7 +704,7 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
             $sqlStmtHoldings->execute([':id' => $id]);
         } catch (PDOException $e) {
             $this->debug('Connection failed: ' . $e->getMessage());
-            throw new ILSException($e->getMessage);
+            throw new ILSException($e->getMessage());
         }
 
         $this->debug("Rows count: " . $itemSqlStmt->rowCount());