Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 701) +++ trunk/CHANGELOG (revision 702) @@ -10,11 +10,13 @@ # = Bugfix ! = Update/Change -------------------------------------- 2.7.0 ------------------------------------- -16-Feb-2008 Thomas Hornik -! updated upgrade-script (menulink) -13-Feb-2008 Thomas Hornik -+ allow externl links in menulink-module +------------------------------------- 2.7.0 ------------------------------------- +17-Feb-2008 Christian Sommer +# fixed language bug (backend language switched to the pages language viewed in frontend) +16-Feb-2008 Thomas Hornik +! updated upgrade-script (menulink) +13-Feb-2008 Thomas Hornik ++ allow externl links in menulink-module # fixed an highlighting-issue: highlighting a page with more than one sections mangled umlauts in the second to last section. 10-Feb-2008 Matthias Gallas # fixed some errors in standard german language file Index: trunk/wb/framework/class.admin.php =================================================================== --- trunk/wb/framework/class.admin.php (revision 701) +++ trunk/wb/framework/class.admin.php (revision 702) @@ -71,6 +71,19 @@ die($MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES']); } } + + // Check if the backend language is also the selected language. If not, send headers again. + global $database; + $get_user_language = @$database->query("SELECT language FROM ".TABLE_PREFIX. + "users WHERE user_id = '" .(int) $this->get_user_id() ."'"); + $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); + exit(); + } + // Auto header code if($auto_header == true) { $this->print_header(); Index: trunk/wb/install/save.php =================================================================== --- trunk/wb/install/save.php (revision 701) +++ trunk/wb/install/save.php (revision 702) @@ -170,7 +170,7 @@ // End path and timezone details code // Get the default language -$allowed_languages = array('CA', 'DA', 'DE', 'DE_du', 'EN', 'ES', 'ET', 'FI', 'FR', 'HR', 'HU', 'IT', 'LV', 'NL', 'PT','SE', 'TR'); +$allowed_languages = array('CA', 'DA', 'DE', 'EN', 'ES', 'ET', 'FI', 'FR', 'HR', 'HU', 'IT', 'LV', 'NL', 'PT','SE', 'TR'); if(!isset($_POST['default_language']) OR !in_array($_POST['default_language'], $allowed_languages)) { set_error('Please select a valid default backend language','default_language'); } else { Index: trunk/wb/install/index.php =================================================================== --- trunk/wb/install/index.php (revision 701) +++ trunk/wb/install/index.php (revision 702) @@ -246,8 +246,8 @@