remove basename() from App::url() page build

atk4 · Sep 17, 2023 · 8d7cab6 · 8d7cab6
1 parent 637f66a
commit 8d7cab6
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/App.php b/src/App.php
@@ -673,13 +673,11 @@ public function url($page = [], array $extraRequestUrlArgs = []): string
             if ($pagePath === '') { // TODO path must always start with '/'
                 $pagePath = '/';
             }
-            if (substr($pagePath, -1) === '/') {
-                $pagePath = $this->urlBuildingIndexPage;
-            } else {
-                $pagePath = basename($pagePath, $this->urlBuildingExt);
-            }
         }
-        if (!str_contains(basename($pagePath), '.')) {
+        if (str_ends_with($pagePath, '/')) {
+            $pagePath .= $this->urlBuildingIndexPage;
+        }
+        if (!str_ends_with($pagePath, '/') && !str_contains(basename($pagePath), '.')) {
             $pagePath .= $this->urlBuildingExt;
         }