fixes

pmaxs · Sep 25, 2016 · 93f4b81 · 93f4b81
1 parent 91f988a
commit 93f4b81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/EventListener/LocaleListener.php b/src/EventListener/LocaleListener.php
@@ -155,7 +155,6 @@ protected function getExcludeRoutesReg()
             $exclude_routes_reg = false;
         }
 
-
         return $exclude_routes_reg;
     }
 }
diff --git a/src/Provider/LocaleServiceProvider.php b/src/Provider/LocaleServiceProvider.php
@@ -18,6 +18,7 @@ class LocaleServiceProvider implements ServiceProviderInterface
      */
     public function register(Application $app)
     {
+        $app['locale.resolve_by_host'] = false;
         $app['locale.exclude_routes'] = [];
         $app['locale.fake_index_route'] = 'locale-index0';
 
@@ -60,7 +61,7 @@ public function boot(Application $app)
             array_merge($app['locale.exclude_routes'], [$app['locale.fake_index_route']])
         ));
 
-        if (!$this->resolve_by_host) {
+        if (!$app['locale.resolve_by_host']) {
             $app['routes']->add($app['locale.fake_index_route'], new Route(
                 '/{locale0}/',
                 ['locale0' => '', '_controller' => null],

diff --git a/src/Utils/UrlGenerator.php b/src/Utils/UrlGenerator.php
@@ -99,7 +99,10 @@ public function getUrlForLocale($url, $locale, $absolute = false)
             return $url;
 
         } else {
-            if (!strlen($url_parts['path']) && !strlen($url_parts['query'])) {
+            if (
+                (!isset($url_parts['path']) || !strlen($url_parts['path']))
+                && (!isset($url_parts['query']) || !strlen($url_parts['query']))
+            ) {
                 return $url;
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,7 +155,6 @@ protected function getExcludeRoutesReg() @@
                 $exclude_routes_reg = false;
             }
             return $exclude_routes_reg;
         }
     }