Merge pull request #759 from getgrav/feature/fix-redirect

Add params, query and fragment when redirecting to a language or default route
getgrav · Apr 6, 2016 · 33d69d7 · 33d69d7
2 parents 9d2ef02 + 7619d3b
commit 33d69d7
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
@@ -152,18 +152,35 @@ protected static function load(array $values)
 
             // Redirection tests
             if ($page) {
+                $url = $page->route();
+
+                if ($uri->params()) {
+                    if ($url == '/') { //Avoid double slash
+                        $url = $uri->params();
+                    } else {
+                        $url .= $uri->params();
+                    }
+                }
+                if ($uri->query()) {
+                    $url .= '?' . $uri->query();
+                }
+                if ($uri->fragment()) {
+                    $url .= '#' . $uri->fragment();
+                }
+
                 // Language-specific redirection scenarios
                 if ($language->enabled()) {
                     if ($language->isLanguageInUrl() && !$language->isIncludeDefaultLanguage()) {
-                        $c->redirect($page->route());
+                        $c->redirect($url);
                     }
                     if (!$language->isLanguageInUrl() && $language->isIncludeDefaultLanguage()) {
-                        $c->redirectLangSafe($page->route());
+                        $c->redirectLangSafe($url);
                     }
                 }
+
                 // Default route test and redirect
                 if ($c['config']->get('system.pages.redirect_default_route') && $page->route() != $path) {
-                    $c->redirectLangSafe($page->route());
+                    $c->redirectLangSafe($url);
                 }
             }