Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 797)
+++ trunk/CHANGELOG	(revision 798)
@@ -10,7 +10,9 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
+------------------------------------- 2.7.0 -------------------------------------
+04-Apr-2008 Thomas Hornik
+#	fixed: Language-redirect removed query-string from URL
 04-Apr-2008 Christian Sommer
 !	set WB version to 2.7 (RC3) for the next upcoming release candidate
 03-Apr-2008 Christian Sommer
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 797)
+++ trunk/wb/framework/class.frontend.php	(revision 798)
@@ -144,7 +144,11 @@
 			$this->page = $get_page->fetchRow();
 			// Check if the page language is also the selected language. If not, send headers again.
 			if ($this->page['language']!=LANGUAGE) {
-				header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language']);
+				if(isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '') { // check if there is an query-string
+					header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language'].'&'.$_SERVER['QUERY_STRING']);
+				} else {
+					header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language']);
+				}
 				exit();
 			}
 			// Begin code to set details as either variables of constants