Fix laravel/framework#57456 (#16)

* Fix laravel/framework#57456

* Fix laravel/framework#57456

* Fix laravel/framework#57456

* Fix laravel/framework#57456

* Fix laravel/framework#57456

---------

Co-authored-by: Pantea Marius-ciclistu <>

Author: macropay-solutions

illuminate/Routing/UrlGenerator.php

@@ -162,34 +162,35 @@ public function current()
      */
     public function previous($fallback = false)
     {
-        $referrer = $this->request->headers->get('referer');
+        $fallback = (string)$fallback;
+        $referrer = (string)$this->request->headers->get('referer');
 
-        $url = $referrer ? $this->to($referrer) : $this->getPreviousUrlFromSession();
+        if ('' === $referrer) {
+            $referrer = (string)$this->getPreviousUrlFromSession();
+        }
 
-        if ($url) {
-            return $url;
-        } elseif ($fallback) {
-            return $this->to($fallback);
+        if ('' === $referrer) {
+            return (string)$this->to('' === $fallback ? '/' : $fallback);
         }
 
-        return $this->to('/');
+        $previous = (string)$this->to($referrer);
+
+        return '' !== $previous ? $previous : (string)$this->to('' === $fallback ? '/' : $fallback);
     }
 
     /**
-     * Get the previous path info for the request.
+     * Get the previous path for the request.
      *
      * @param mixed $fallback
      * @return string
      */
     public function previousPath($fallback = false)
     {
-        $previousPath = str_replace(
-            $this->to('/'),
-            '',
-            rtrim(preg_replace('/\?.*/', '', $this->previous($fallback)), '/')
-        );
+        if (!\is_string($path = \parse_url($this->previous($fallback), PHP_URL_PATH))) {
+            return '/';
+        }
 
-        return $previousPath === '' ? '/' : $previousPath;
+        return $path === '/' ? $path : \rtrim($path, '/');
     }
 
     /**