PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup! Don't redirect to REQUEST_URI when browsing to index.php Instead, we can make sure everything works correctly on index.php

Browse source
This commit is contained in:
Pierre Rudloff 2022-02-20 14:06:59 +01:00
parent 3ab22c654a
commit 2afbfb4bf2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
classes/Factory/ViewFactory.php
View file

@ -45,12 +45,21 @@ class ViewFactory
{ {
$basePath = $uri->getBasePath(); $basePath = $uri->getBasePath();
if (str_ends_with($basePath, 'index.php')) { if (str_ends_with($basePath, 'index.php')) {
$basePath = dirname($basePath);
if ($basePath == '/') {
/*
* Calling withBasePath('/') does nothing,
* we have to use an empty string instead.
*/
$basePath = '';
}
/* /*
* When the base path ends with index.php, * When the base path ends with index.php,
* routing works correctly, but it breaks the URL of static assets using {base_url}. * routing works correctly, but it breaks the URL of static assets using {base_url}.
* So we alter the base path but only in the URI used by SmartyPlugins. * So we alter the base path but only in the URI used by SmartyPlugins.
*/ */
$uri = $uri->withBasePath(dirname($basePath)); $uri = $uri->withBasePath($basePath);
} }
return $uri; return $uri;