Merge pull request #46 from emrullahardc/1.9

spektra2147 · web-flow · commit 27c89d92cbdf · 2023-07-05T09:48:49.000+03:00
Update UrlGenerator.php
diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php
@@ -35,10 +35,13 @@ public function __construct(RouteCollection $routes, Request $request)
         parent::__construct(app('router')->getRoutes(), $request);
 
         $this->parser = app(Engine::class);
+        $forcedRoot = env('APP_URL',$request->root());
 
         if (defined('LOCALE')) {
-            $this->forceRootUrl($request->root() . '/' . LOCALE);
+            $forcedRoot.='/'.LOCALE;
         }
+
+        $this->forceRootUrl($forcedRoot);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,13 @@ public function __construct(RouteCollection $routes, Request $request)`
`35`	`35`	`parent::__construct(app('router')->getRoutes(), $request);`
`36`	`36`
`37`	`37`	`$this->parser = app(Engine::class);`
	`38`	`+ $forcedRoot = env('APP_URL',$request->root());`
`38`	`39`
`39`	`40`	`if (defined('LOCALE')) {`
`40`		`- $this->forceRootUrl($request->root() . '/' . LOCALE);`
	`41`	`+ $forcedRoot.='/'.LOCALE;`
`41`	`42`	`}`
	`43`	`+`
	`44`	`+ $this->forceRootUrl($forcedRoot);`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`/**`