Merged changes from main trunk up to 2.2.7

[fa-stable.git] / includes / session.inc

diff --git a/includes/session.inc b/includes/session.inc
index d8f4af1dfb9b290776ad57b4840ceba5bdc0444f..5c5ec42be41a5e208924c0a6593a7e8fedf126b5 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -183,7 +183,7 @@ header("Cache-control: private");
 get_text_init();
 
 // Page Initialisation
-if (!method_exists($_SESSION['language'], 'set_language')) 
+if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) 
 {
        $l = array_search_value($dflt_lang, $installed_languages,  'code');
        $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],