From ed7140dd8a3968eee4d78e2db287a0037ad3bee6 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 18 Nov 2014 09:46:18 -0500
Subject: [PATCH] Added missing parameters to checkCapability calls.
---
.../Controller/Plugin/AbstractRequestBase.php | 15 +++++++++------
.../src/VuFind/Controller/RecordController.php | 6 +++---
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php b/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
index eba75a7bed3..03edf858400 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
@@ -270,12 +270,15 @@ abstract class AbstractRequestBase extends AbstractPlugin
}
// If the driver setting is active, try it out:
- if ($useDriver && $catalog
- && $catalog->checkCapability('getHoldDefaultRequiredDate')
- ) {
- $result = $catalog->getHoldDefaultRequiredDate($patron, $holdInfo);
- if (!empty($result)) {
- return $result;
+ if ($useDriver && $catalog) {
+ $check = $catalog->checkCapability(
+ 'getHoldDefaultRequiredDate', array($patron, $holdInfo)
+ );
+ if ($check) {
+ $result = $catalog->getHoldDefaultRequiredDate($patron, $holdInfo);
+ if (!empty($result)) {
+ return $result;
+ }
}
}
diff --git a/module/VuFind/src/VuFind/Controller/RecordController.php b/module/VuFind/src/VuFind/Controller/RecordController.php
index e1d72b97901..2576ea0d062 100644
--- a/module/VuFind/src/VuFind/Controller/RecordController.php
+++ b/module/VuFind/src/VuFind/Controller/RecordController.php
@@ -132,9 +132,9 @@ class RecordController extends AbstractRecord
// Send various values to the view so we can build the form:
$pickup = $catalog->getPickUpLocations($patron, $gatheredDetails);
- $requestGroups = $catalog->checkCapability('getRequestGroups')
- ? $catalog->getRequestGroups($driver->getUniqueID(), $patron)
- : array();
+ $requestGroups = $catalog->checkCapability(
+ 'getRequestGroups', array($driver->getUniqueID(), $patron)
+ ) ? $catalog->getRequestGroups($driver->getUniqueID(), $patron) : array();
$extraHoldFields = isset($checkHolds['extraHoldFields'])
? explode(":", $checkHolds['extraHoldFields']) : array();
--
GitLab