From cae4a1a42e17987f3aea31b4421c914f4bd160ea Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 6 Nov 2017 13:59:30 -0500
Subject: [PATCH] Adjust service locator loading in controllers.

---
 module/VuFind/src/VuFind/Controller/AbstractBase.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index f2d4167b93a..0fde7735e0e 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -67,6 +67,13 @@ class AbstractBase extends AbstractActionController
      */
     protected $accessDeniedBehavior = null;
 
+    /**
+     * Service manager
+     *
+     * @var ServiceLocatorInterface
+     */
+    protected $serviceLocator;
+
     /**
      * Constructor
      *
@@ -74,7 +81,7 @@ class AbstractBase extends AbstractActionController
      */
     public function __construct(ServiceLocatorInterface $sm)
     {
-        $this->setServiceLocator($sm);
+        $this->serviceLocator = $sm;
     }
 
     /**
-- 
GitLab