From a7794e57c5d2a0643709fa2463441cb9525041cd Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sun, 29 Nov 2009 10:08:00 +0000
Subject: [PATCH] Fixed language change bug in display prefferences.

---
 CHANGELOG.txt              | 4 ++++
 includes/lang/language.php | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d4da3a0..f085680 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+29-Nov-2009 Janusz Dobrowolski
+# Fixed change of language in display preferences.
+$ /includes/lang/language.php
+
 28-Nov-2009 Chaitanya/Joe Hunt
 # Missing ajax trigger in stock_purchasable_items_list_cells. Prices not updated instantly.
 $ /purchasing/includes/ui/po_ui.inc
diff --git a/includes/lang/language.php b/includes/lang/language.php
index f9b86b1..32290ed 100644
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -46,7 +46,7 @@ class language
 	function set_language($code) 
 	{
 	    global $comp_path, $path_to_root;
-		
+
 		$changed = $_SESSION['language']->code != $code;
 		if (isset($_SESSION['languages'][$code]) && $changed)
 		{
@@ -57,7 +57,8 @@ class language
 			// check id file exists only once for session
 			$_SESSION['language']->is_locale_file = file_exists($locale);
 		}
-		$lang = $_SESSION['language'];
+		$lang = PHP_VERSION<5 ? $_SESSION['language'] : clone($_SESSION['language']);
+
 		$_SESSION['get_text']->set_language($lang->code, $lang->encoding);
 		$_SESSION['get_text']->add_domain($lang->code, $path_to_root . "/lang");
 		
-- 
2.30.2