X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FRouter.php;h=6d90fb0138b30ad7c20d0f656aa8410e702be0e9;hb=4c6334ea13c0774e31b83a1cc7713c0560f7d66d;hp=5b915c0e6a3ea086b1ac97b8d92de94c8c392710;hpb=1ec4c14501268b2e5a9b1ac7e231b7a68f7f38eb;p=friendica.git diff --git a/src/App/Router.php b/src/App/Router.php index 5b915c0e6a..6d90fb0138 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -1,6 +1,6 @@ baseRoutesFilepath && !file_exists($this->baseRoutesFilepath)) { throw new HTTPException\InternalServerErrorException('Routes file path does\'n exist.'); } + + $this->parameters = [$this->server]; } /** @@ -293,18 +295,16 @@ class Router $dispatcher = new FriendicaGroupCountBased($this->getCachedDispatchData()); - $this->parameters = [$this->server]; - try { // Check if the HTTP method is OPTIONS and return the special Options Module with the possible HTTP methods if ($this->args->getMethod() === static::OPTIONS) { $this->moduleClass = Options::class; - $this->parameters = ['allowedMethods' => $dispatcher->getOptions($cmd)]; + $this->parameters[] = ['AllowedMethods' => $dispatcher->getOptions($cmd)]; } else { $routeInfo = $dispatcher->dispatch($this->args->getMethod(), $cmd); if ($routeInfo[0] === Dispatcher::FOUND) { $this->moduleClass = $routeInfo[1]; - $this->parameters[] = $routeInfo[2]; + $this->parameters[] = $routeInfo[2]; } else if ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) { throw new HTTPException\MethodNotAllowedException($this->l10n->t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1]))); } else { @@ -412,7 +412,7 @@ class Router } if (!$this->lock->acquire('getCachedDispatchData', 0)) { - // Immediately return uncached data when we can't aquire a lock + // Immediately return uncached data when we can't acquire a lock return $this->getDispatchData(); }