Merge remote-tracking branch 'origin/MAGETWO-52867-404' into pr

Igor Melnikov · Igor Melnikov · commit 8498a20a2ed4 · 2016-06-07T14:34:23.000-05:00
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -409,7 +409,8 @@ public function isDeveloperMode()
             $mode = $this->server[State::PARAM_MODE];
         } else {
             $deploymentConfig = $this->getObjectManager()->get(DeploymentConfig::class);
-            if (($configMode = $deploymentConfig->get(State::PARAM_MODE)) !== null) {
+            $configMode = $deploymentConfig->get(State::PARAM_MODE);
+            if ($configMode) {
                 $mode = $configMode;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,8 @@ public function isDeveloperMode()`
`409`	`409`	`$mode = $this->server[State::PARAM_MODE];`
`410`	`410`	`} else {`
`411`	`411`	`$deploymentConfig = $this->getObjectManager()->get(DeploymentConfig::class);`
`412`		`- if (($configMode = $deploymentConfig->get(State::PARAM_MODE)) !== null) {`
	`412`	`+ $configMode = $deploymentConfig->get(State::PARAM_MODE);`
	`413`	`+ if ($configMode) {`
`413`	`414`	`$mode = $configMode;`
`414`	`415`	`}`
`415`	`416`	`}`