aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rwxr-xr-xindex.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/index.php b/index.php
index a07c1a633..5a9ec1026 100755
--- a/index.php
+++ b/index.php
@@ -27,9 +27,6 @@ $a->install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? fal
@include(".htconfig.php");
-$a->language = get_best_language();
-
-
/**
*
* Try to open the database;
@@ -54,13 +51,14 @@ if(! $a->install) {
load_hooks();
call_hooks('init_1');
+ $a->language = get_best_language();
load_translation_table($a->language);
// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
if(intval($a->config['system']['ssl_cookie_protection'])) {
$arr = session_get_cookie_params();
session_set_cookie_params(
- ((isset($arr['lifetime'])) ? $arr['lifetime'] : 60*5),
+ ((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
((isset($arr['path'])) ? $arr['path'] : '/'),
((isset($arr['domain'])) ? $arr['domain'] : $a->get_hostname()),
((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
@@ -69,6 +67,7 @@ if(! $a->install) {
}
else {
// load translations but do not check plugins as we have no database
+ $a->language = get_best_language();
load_translation_table($a->language,true);
}