clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7076 from MrPetovan/bug/fix-proxy-router 

Fix Proxy module routes
This commit is contained in:
Philipp 2019-05-03 07:31:30 +02:00 committed by GitHub
parent cd41efe29d 70bef12fd2
commit 900fe158f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/App/Router.php
View File

@ -146,10 +146,10 @@ class Router
$collector->addRoute(['GET'], '/{profile:\d+}/view', Module\Profile::class);
});
$this->routeCollector->addGroup('/proxy', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '[/]', Module\Proxy::class);
$collector->addRoute(['GET'], '/{url}', Module\Proxy::class);
$collector->addRoute(['GET'], '/sub1/{url}', Module\Proxy::class);
$collector->addRoute(['GET'], '/sub1/sub2/{url}', Module\Proxy::class);
$collector->addRoute(['GET'], '[/]' , Module\Proxy::class);
$collector->addRoute(['GET'], '/{url}' , Module\Proxy::class);
$collector->addRoute(['GET'], '/{sub1}/{url}' , Module\Proxy::class);
$collector->addRoute(['GET'], '/{sub1}/{sub2}/{url}' , Module\Proxy::class);
});
$this->routeCollector->addRoute(['GET', 'POST'], '/register', Module\Register::class);
$this->routeCollector->addRoute(['GET'], '/statistics.json', Module\Statistics::class);

8
view/templates/exception.tpl
View File

@ -1,4 +1,4 @@
<div id="exception" class="generic-page-wrapper">
<h1>{{$title}}</h1>
<p>{{$message}}</p>
</div>
<div id="exception" class="generic-page-wrapper">
<h1>{{$title}}</h1>
<p>{{$message}}</p>
</div>