X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=8f780caa3220a1aba764784f0310d9101110af29;hb=628583995e3be96a346a9c078a41cf5ee0eab238;hp=04acec518543dc53ddc940be48a8f0bc6ad933d3;hpb=7796f55d85412cbc2904b0577b419d9625958257;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index 04acec51..8f780caa 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -165,7 +165,7 @@ header("Cache-control: private");
 get_text_init();
 
 // Page Initialisation
-if (!isset($_SESSION['languages'])) 
+if (!isset($_SESSION['language'])) 
 {
 	load_languages(); // sets also default $_SESSION['language']
 }
@@ -206,8 +206,6 @@ set_error_handler('error_handler' /*, errtypes */);
 if (!isset($_SESSION["wa_current_user"]))
 	$_SESSION["wa_current_user"] = new current_user();
 
-set_global_connection();
-
 // logout.php is the only page we should have always 
 // accessable regardless of access level and current login status.
 if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
@@ -243,15 +241,19 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 			$lang = &$_SESSION['language'];
 			$lang->set_language($_SESSION['language']->code);
 		}
-	}
+	} else
+		set_global_connection();
 
-	include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
+	if (!$_SESSION["wa_current_user"]->old_db)
+		include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
 
 	if (!isset($_SESSION["App"])) {
 		$_SESSION["App"] = new front_accounting();
 		$_SESSION["App"]->init();
 	}
 }
+
+
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
 	$_POST = strip_quotes($_POST);