File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -107,6 +107,7 @@ public function dispatch(Request $request, $version)
107107 $ this ->removeMiddlewareFromApp ();
108108
109109 $ routeCollector = $ this ->mergeOldRoutes ($ version );
110+
110111 $ dispatcher = call_user_func ($ this ->dispatcherResolver , $ routeCollector );
111112
112113 $ this ->app ->setDispatcher ($ dispatcher );
Original file line number Diff line number Diff line change @@ -402,6 +402,10 @@ protected function mergeGroup(array $new, array $old)
402402 $ new [$ option ] = $ this ->formatArrayBasedOption ($ option , $ new );
403403 }
404404
405+ if (isset ($ new ['version ' ])) {
406+ unset($ old ['version ' ]);
407+ }
408+
405409 if (isset ($ new ['domain ' ])) {
406410 unset($ old ['domain ' ]);
407411 }
@@ -588,7 +592,7 @@ public function gatherRouteMiddlewares($route)
588592 */
589593 protected function requestIsConditional ()
590594 {
591- return $ this ->getCurrentRoute ()->requestIsConditional ();
595+ return ( $ r = $ this ->getCurrentRoute ()) ? $ r ->requestIsConditional () : false ;
592596 }
593597
594598 /**
You can’t perform that action at this time.
0 commit comments