From 0f0ae6eb6d770c7cb65a12d16986ef04f0f17a33 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 5 Aug 2010 06:32:40 +0000
Subject: [PATCH] - set correct default-value on "change password" view, fixes
 #317

---
 admin_index.php    | 7 ++++++-
 customer_index.php | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin_index.php b/admin_index.php
index c115c366..573d03ea 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -281,9 +281,14 @@ elseif($page == 'change_language')
 	{
 		$language_options = '';
 
+		$default_lang = $settings['panel']['standardlanguage'];
+		if($userinfo['def_language'] != '') { 
+			$default_lang = $userinfo['def_language'];
+		}
+
 		while(list($language_file, $language_name) = each($languages))
 		{
-			$language_options.= makeoption($language_name, $language_file, $userinfo['def_language'], true);
+			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
 		eval("echo \"" . getTemplate("index/change_language") . "\";");
diff --git a/customer_index.php b/customer_index.php
index 137489a0..589f3775 100644
--- a/customer_index.php
+++ b/customer_index.php
@@ -172,9 +172,14 @@ elseif($page == 'change_language')
 	{
 		$language_options = '';
 
+		$default_lang = $settings['panel']['standardlanguage'];
+		if($userinfo['def_language'] != '') { 
+			$default_lang = $userinfo['def_language'];
+		}
+
 		while(list($language_file, $language_name) = each($languages))
 		{
-			$language_options.= makeoption($language_name, $language_file, $userinfo['def_language'], true);
+			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
 		eval("echo \"" . getTemplate("index/change_language") . "\";");