Merge branch 'master' of https://github.com/zendframework/zf2

zendframework · Sep 18, 2012 · 56c198e · 56c198e
3 parents 6335bda + c5fc623 + ceec2bd
commit 56c198e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -61,8 +61,9 @@ public function getShared()
 
     public function configureServiceManager(ServiceManager $serviceManager)
     {
-        $allowOverride = $this->getAllowOverride();
-        isset($allowOverride) ? $serviceManager->setAllowOverride($allowOverride) : null;
+        if (($allowOverride = $this->getAllowOverride()) !== null) {
+            $serviceManager->setAllowOverride($allowOverride);
+        }
 
         foreach ($this->getFactories() as $name => $factory) {
             $serviceManager->setFactory($name, $factory);