Merge pull request #56 from ARCANEDEV/patch-middleware

Updating middleware and other stuff
ARCANEDEV · Aug 24, 2016 · 2430a7c · 2430a7c
2 parents 94988c2 + 829cd66
commit 2430a7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Middleware/LocalizationRedirect.php b/src/Middleware/LocalizationRedirect.php
@@ -65,7 +65,7 @@ protected function getRedirectionUrl(Request $request)
             $this->getCurrentLocale() !== $this->getDefaultLocale() ||
             ! $this->hideDefaultLocaleInURL()
         ) {
-            return localization()->getLocalizedURL(session('locale'), $request->path());
+            return localization()->getLocalizedURL(session('locale'), $request->fullUrl());
         }
 
         return false;

diff --git a/src/Utilities/Url.php b/src/Utilities/Url.php
@@ -4,7 +4,6 @@
 use Arcanedev\Localization\Contracts\UrlInterface;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
-use Illuminate\Routing\Router;
 
 /**
  * Class     Url
@@ -29,9 +28,6 @@ class Url implements UrlInterface
      */
     public static function extractAttributes($url = false)
     {
-        /** @var Router $router */
-        $router     = app('router');
-
         $parse  = parse_url($url);
         $path   = isset($parse['path']) ? explode('/', $parse['path']) : [];
         $url    = [];
@@ -40,6 +36,9 @@ public static function extractAttributes($url = false)
             if ( ! empty($segment)) $url[] = $segment;
         }
 
+        /** @var \Illuminate\Routing\Router $router */
+        $router = app('router');
+
         return self::extractAttributesFromRoutes($url, $router->getRoutes());
     }
 
@@ -194,8 +193,6 @@ private static function extractAttributesFromSegment($url, $path, $i, $j, $segme
      * Check parsed URL.
      *
      * @param  array  $parsed
-     *
-     * @return array
      */
     private static function checkParsedUrl(array &$parsed)
     {