Merge remote-tracking branch 'upstream/master'

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 49e6fccb05c0b09868f721e4f4fab456a6c95985..40551f3881cf22860f0fd89b797c15513e88c345 100644 (file)
--- a/index.php
+++ b/index.php
@@ -32,9 +32,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 
 
-$lang = get_browser_language();
 
-load_translation_table($lang);
 
 /**
  *
@@ -58,10 +56,13 @@ if(!$install) {
        require_once("include/session.php");
        load_hooks();
        call_hooks('init_1');
+
+       $maintenance = get_config('system', 'maintenance');
 }
 
-$maintenance = get_config('system', 'maintenance');
+$lang = get_browser_language();
 
+load_translation_table($lang);
 
 /**
  *
@@ -141,7 +142,8 @@ if($install)
 elseif($maintenance)
        $a->module = 'maintenance';
 else {
-       proc_run('php', 'include/dbupdate.php');
+       check_url($a);
+       check_db();
        check_plugins($a);
 }