bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12365 from MrPetovan/bug/fatal-errors

Browse source 
Address a couple of fatal error messages
This commit is contained in:
Philipp 2022-12-08 17:14:51 +01:00 committed by GitHub
commit fc675a1736
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/App/Router.php
View file

@ -150,6 +150,8 @@ class Router
if ($this->baseRoutesFilepath && !file_exists($this->baseRoutesFilepath)) { if ($this->baseRoutesFilepath && !file_exists($this->baseRoutesFilepath)) {
throw new HTTPException\InternalServerErrorException('Routes file path does\'n exist.'); throw new HTTPException\InternalServerErrorException('Routes file path does\'n exist.');
} }
$this->parameters = [$this->server];
} }
/** /**
@ -293,13 +295,11 @@ class Router
$dispatcher = new FriendicaGroupCountBased($this->getCachedDispatchData()); $dispatcher = new FriendicaGroupCountBased($this->getCachedDispatchData());
$this->parameters = [$this->server];
try { try {
// Check if the HTTP method is OPTIONS and return the special Options Module with the possible HTTP methods // Check if the HTTP method is OPTIONS and return the special Options Module with the possible HTTP methods
if ($this->args->getMethod() === static::OPTIONS) { if ($this->args->getMethod() === static::OPTIONS) {
$this->moduleClass = Options::class; $this->moduleClass = Options::class;
$this->parameters = ['allowedMethods' => $dispatcher->getOptions($cmd)]; $this->parameters[] = ['AllowedMethods' => $dispatcher->getOptions($cmd)];
} else { } else {
$routeInfo = $dispatcher->dispatch($this->args->getMethod(), $cmd); $routeInfo = $dispatcher->dispatch($this->args->getMethod(), $cmd);
if ($routeInfo[0] === Dispatcher::FOUND) { if ($routeInfo[0] === Dispatcher::FOUND) {