Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css

1 files changed, 8 insertions, 1 deletions

diff --git a/index.php b/index.php
index cc6249256..8d59a8a8e 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 $a->language = get_best_language();
 	
-load_translation_table($a->language);
 
 /**
  *
@@ -53,9 +52,17 @@ if(! $install) {
 	require_once("session.php");
 	load_hooks();
 	call_hooks('init_1');
+	
+	load_translation_table($a->language);
+}
+else {
+	// load translations but do not check plugins as we have no database
+	load_translation_table($a->language,true);
 }
 
 
+
+
 /**
  *
  * Important stuff we always need to do.