Merge pull request #5 from locomotivemtl/locale-from-host

Define language in GenericRoute's ObjectRoute query
locomotivemtl · Oct 17, 2017 · 6043e45 · 6043e45
2 parents 5641a7e + dce4dc5
commit 6043e45
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Charcoal/Cms/Route/GenericRoute.php b/src/Charcoal/Cms/Route/GenericRoute.php
@@ -386,10 +386,11 @@ protected function loadObjectRouteFromPath()
         // Slug can be duplicated by adding the front "/" to it hence the order by last_modification_date
         $route = $this->createRouteObject();
         $route->loadFromQuery(
-            'SELECT * FROM `'.$route->source()->table().'` WHERE (`slug` = :route1 OR `slug` = :route2) ORDER BY last_modification_date DESC LIMIT 1',
+            'SELECT * FROM `'.$route->source()->table().'` WHERE (`slug` = :route1 OR `slug` = :route2) AND `lang` = :lang ORDER BY last_modification_date DESC LIMIT 1',
             [
                 'route1' => '/'.$this->path(),
-                'route2' => $this->path()
+                'route2' => $this->path(),
+                'lang'   => $this->translator()->getLocale()
             ]
         );