From 956273cf2bc796beac5ce35cc5568f0f3399412e Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 14 Mar 2016 10:16:27 -0400
Subject: [PATCH] Code simplification.
---
.../src/VuFind/ILS/Driver/VoyagerRestful.php | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
index 39705ce5cbe..d44ddfbe37c 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
@@ -618,10 +618,9 @@ class VoyagerRestful extends Voyager implements \VuFindHttp\HttpServiceAwareInte
*/
public function checkStorageRetrievalRequestIsValid($id, $data, $patron)
{
- if (!isset($this->config['StorageRetrievalRequests'])) {
- return false;
- }
- if ($this->checkAccountBlocks($patron['id'])) {
+ if (!isset($this->config['StorageRetrievalRequests'])
+ || $this->checkAccountBlocks($patron['id'])
+ ) {
return false;
}
@@ -629,13 +628,7 @@ class VoyagerRestful extends Voyager implements \VuFindHttp\HttpServiceAwareInte
$itemID = ($level != 'title' && isset($data['item_id']))
? $data['item_id']
: false;
- $result = $this->checkItemRequests(
- $patron['id'], 'callslip', $id, $itemID
- );
- if (!$result || $result == 'block') {
- return $result;
- }
- return true;
+ return $this->checkItemRequests($patron['id'], 'callslip', $id, $itemID);
}
/**
--
GitLab