fix bug with request rebind and url defaults

laravel · May 18, 2020 · 6ad92bf · 6ad92bf
1 parent c66fcc3
commit 6ad92bf
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
@@ -699,7 +699,14 @@ public function setRequest(Request $request)
 
         $this->cachedRoot = null;
         $this->cachedScheme = null;
-        $this->routeGenerator = null;
+
+        tap(optional($this->routeGenerator)->defaultParameters ?: [], function ($defaults) {
+            $this->routeGenerator = null;
+
+            if (! empty($defaults)) {
+                $this->defaults($defaults);
+            }
+        });
     }
 
     /**