Fixed language change bug in display prefferences.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d4da3a0ca17b955cfe6c85deccb2ff7adb62fe57..f0856806dfced5477f6b67852d7db6b23fd85c00 100644 (file)
--- 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 f9b86b17ceaf2bfb84cfb10a54c87b893315dca1..32290eda9f2cb0f288ed21a90b6b91e4c10b47fe 100644 (file)
--- 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");