fix BC

stefanotorresi · Oct 18, 2013 · 0a56163 · 0a56163
1 parent f69a41a
commit 0a56163
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/library/Zend/ServiceManager/ServiceManager.php b/library/Zend/ServiceManager/ServiceManager.php
@@ -1042,8 +1042,10 @@ protected function createDelegatorFromFactory($canonicalName, $requestedName)
 
             $delegatorFactory = $this->delegators[$canonicalName][$i];
 
-            if (is_string($delegatorFactory) && class_exists($delegatorFactory, true)) {
+            if (is_string($delegatorFactory)) {
-                $delegatorFactory = new $delegatorFactory;
+                $delegatorFactory = !$this->has($delegatorFactory) && class_exists($delegatorFactory, true) ?
+                    new $delegatorFactory
+                    : $this->get($delegatorFactory);
                 $this->delegators[$canonicalName][$i] = $delegatorFactory;
             }