Fixed site redirect with redirect code failing when redirecting to su…

…b-pages [#3035]
getgrav · Mar 11, 2021 · a67a538 · a67a538
1 parent 6dd7044
commit a67a538
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@
     * Fixed Markdown image attribute `loading` [#3251](https://github.com/getgrav/grav/pull/3251)
     * Fixed `Uri::isValidExtension()` returning false positives
     * Fixed `page.html` returning duplicated content with `system.pages.redirect_default_route` turned on [#3130](https://github.com/getgrav/grav/issues/3130)
+    * Fixed site redirect with redirect code failing when redirecting to sub-pages [#3035](https://github.com/getgrav/grav/pull/3035/files)
 
 # v1.7.7
 ## 02/23/2021

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
@@ -431,8 +431,8 @@ public function getRedirectResponse($route, $code = null): ResponseInterface
         }
 
         if (null === $code) {
-            // Check for code in route
-            $regex = '/.*(\[(30[1-7])\])$/';
+            // Check for redirect code in the route: e.g. /new/[301], /new[301]/route or /new[301].html
+            $regex = '/.*(\[(30[1-7])\])(.\w+|\/.*?)?$/';
             preg_match($regex, $route, $matches);
             if ($matches) {
                 $route = str_replace($matches[1], '', $matches[0]);