Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 744)
+++ trunk/CHANGELOG	(revision 745)
@@ -10,8 +10,10 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
-08-Mar-2008 Thomas Hornik
+------------------------------------- 2.7.0 -------------------------------------
+11-Mar-2008 Christian Sommer
+#	fixed issue with WYSIWYG pages (appears if backend language and page frontend language differs)
+08-Mar-2008 Thomas Hornik
 #	fixed issue with news and end-date
 04-Mar-2008 Christian Sommer
 #	fixed issue with smart view URL link
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php	(revision 744)
+++ trunk/wb/framework/class.admin.php	(revision 745)
@@ -79,8 +79,12 @@
 		$user_language = ($get_user_language) ? $get_user_language->fetchRow() : '';
 		// prevent infinite loop if language file is not XX.php (e.g. DE_du.php)
 		$user_language = substr($user_language[0],0,2);
-		if((LANGUAGE != $user_language) && file_exists(WB_PATH .'/languages/' .$user_language .'.php')) {
-			header('Location: '.$_SERVER['PHP_SELF'].'?lang='.$user_language);
+		if((LANGUAGE != $user_language) && file_exists(WB_PATH .'/languages/' .$user_language .'.php')
+				&& strpos($_SERVER['PHP_SELF'],'/admin/') !== false) {
+			// check if page_id is set
+			$page_id_url = (isset($_GET['page_id'])) ? '&page_id=' .(int) $_GET['page_id'] : '';
+			$section_id_url = (isset($_GET['section_id'])) ? '&section_id=' .(int) $_GET['section_id'] : '';
+			header('Location: '.$_SERVER['PHP_SELF'] .'?lang='.$user_language .$page_id_url .$section_id_url);
 			exit();
 		}