Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/2372' into develop

Close #2372
  • Loading branch information...
commit bf65e9a8502bfbbb6084a945efae1a51fed27857 2 parents 7abb3e9 + d18089a
@weierophinney weierophinney authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 library/Zend/ServiceManager/Config.php
View
5 library/Zend/ServiceManager/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);

0 comments on commit bf65e9a

Please sign in to comment.
Something went wrong with that request. Please try again.