[-] FO: Fix lang links when url rewrite is not activated

2012-07-10 13:29:02 +00:00
parent 79bc48fe83
commit 71befce59a
2 changed files with 13 additions and 16 deletions
@@ -399,20 +399,8 @@ class ToolsCore
 				$context->language = $language;

 			$params = $_GET;
-			unset($params['id_lang']);
-
-			if (!Configuration::get('PS_REWRITING_SETTINGS'))
-			{
-				if (empty($params['controller']))
-					unset($params['controller']);
-				elseif (!empty(Context::getContext()->controller->php_self))
-					$params['controller'] = Context::getContext()->controller->php_self;
-					
-				if (empty($params))
-					Tools::redirect('index.php');
-				else
-					Tools::redirect('index.php?'.http_build_query($params));
-			}
+			if (Configuration::get('PS_REWRITING_SETTINGS') || !Language::isMultiLanguageActivated())
+				unset($params['id_lang']);
 		}
 	}