Use route and query parameters for bootstrapping

aimeos · May 4, 2016 · 585a697 · 585a697
1 parent b7adea6
commit 585a697
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/src/Aimeos/Shop/Base/Context.php b/src/Aimeos/Shop/Base/Context.php
@@ -11,6 +11,7 @@
 
 
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Route;
 
 
@@ -163,17 +164,9 @@ protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context )
 	{
 		if( $this->locale === null )
 		{
-			if( Route::current() !== null )
-			{
-				$site = Route::input( 'site', 'default' );
-				$lang = Route::input( 'locale', '' );
-				$currency = Route::input( 'currency', '' );
-			}
-			else
-			{
-				$site = 'default';
-				$lang = $currency = '';
-			}
+			$site = Route::input( 'site', Input::get( 'site', 'default' ) );
+			$currency = Route::input( 'currency', Input::get( 'currency', '' ) );
+			$lang = Route::input( 'locale', Input::get( 'locale', '' ) );
 
 			$disableSites = $this->config->get( 'shop.disableSites', true );