Merge branch 'github-master'

This commit is contained in:
Gerrit Drost 2014-05-23 16:22:50 +02:00
commit cd9a3cb43a

View File

@ -118,7 +118,9 @@ class App {
$decorated = $controller; $decorated = $controller;
} }
$httpHost = $httpHost ?: $this->httpHost; if ($httpHost === null) {
$httpHost = $this->httpHost;
}
$allowedOrigins = array_values($allowedOrigins); $allowedOrigins = array_values($allowedOrigins);
if (0 === count($allowedOrigins)) { if (0 === count($allowedOrigins)) {