Merged changes in main branch up to v.2.1.2

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

diff --git a/includes/session.inc b/includes/session.inc
index a6662a7ee0988c58ae3bce3a44a5cb359a4f1303..6de875b93bc78f3a81febbf9a816ef7b1a6be44b 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -103,7 +103,6 @@ include_once($path_to_root . "/includes/current_user.inc");
 include_once($path_to_root . "/includes/lang/language.php");
 include_once($path_to_root . "/config_db.php");
 include_once($path_to_root . "/includes/ajax.inc");
-include_once($path_to_root . "/includes/main.inc");
 include_once($path_to_root . "/includes/ui/ui_msgs.inc");
 
 /*
@@ -127,13 +126,10 @@ if (!isset($_SESSION['languages']))
 language::set_language($_SESSION['language']->code);
 
 include_once($path_to_root . "/config.php");
+include_once($path_to_root . "/includes/main.inc");
 
 $Ajax =& new Ajax();
 
-//include_once($path_to_root . "/includes/main.inc");
-
-//include_once($path_to_root . "/includes/ui/ui_msgs.inc");
-
 // intercept all output to destroy it in case of ajax call
 register_shutdown_function('ob_end_flush');
 ob_start('output_html',0);