From 9d60c5457cd4e9672d04f9dcbe99a6977beb9fbd Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Thu, 1 Sep 2011 20:04:31 +0200
Subject: [PATCH] Use GET array for language selection

---
 application/config/routes.php              |  3 ---
 application/helpers/MY_language_helper.php | 20 +++++---------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 910af04..56036fb 100755
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -41,9 +41,6 @@
 $route['default_controller'] = "dashboard";
 $route['404_override'] = '';
 
-$route['(\w{2})/(.*)'] = '$2';
-$route['(\w{2})'] = $route['default_controller'];
-
 
 /* End of file routes.php */
 /* Location: ./application/config/routes.php */
diff --git a/application/helpers/MY_language_helper.php b/application/helpers/MY_language_helper.php
index c7d53d5..a775522 100644
--- a/application/helpers/MY_language_helper.php
+++ b/application/helpers/MY_language_helper.php
@@ -14,28 +14,18 @@
  * @return string
  */
 if (!function_exists('lang_select')) {
-	function lang_select($img_folder = '', $index_page = false) {
+	function lang_select($img_folder = '') {
 		$CI =& get_instance();
 
 		$link = '<a';
 
 		if ($CI->config->item('language') == 'en_US') {
-			$link .= ' href="' . $CI->config->site_url('de') . '">';
-
-			if ($index_page === true) {
-				$link .= '<img src="' . $CI->config->site_url('assets/images/languages/en.png') . '" />';
-			} else {
-				$link .= '<img src="' . $CI->config->slash_item('base_url') . 'assets/images/languages/en.png" />';
-			}
+			$link .= ' href="?lang=de">';
+			$link .= '<img src="' . $CI->config->slash_item('base_url') . 'assets/images/languages/en.png" />';
 			$link .= ' English';
 		} else if ($CI->config->item('language') == 'de_DE') {
-			$link .= ' href="' . $CI->config->site_url('en') . '" >';
-
-			if ($index_page === true) {
-				$link .= '<img src="' . $CI->config->site_url('assets/images/languages/de.png') . '" />';
-			} else {
-				$link .= '<img src="' . $CI->config->slash_item('base_url') . 'assets/images/languages/de.png" />';
-			}
+			$link .= ' href="?lang=en">';
+			$link .= '<img src="' . $CI->config->slash_item('base_url') . 'assets/images/languages/de.png" />';
 			$link .= ' Deutsch';
 		}