X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=94329eedc833a150f5cab8f27693fa9d3da1ed5c;hb=6f415946348a4e88830b81aeba5afba5385b8a1e;hp=5dd93523e3a78dd86e99a7df6ba1165f44aedebd;hpb=703bfcb6d4bd21e68aaabd5f1b256106c505f0e9;p=friendica.git diff --git a/index.php b/index.php index 5dd93523e3..94329eedc8 100644 --- a/index.php +++ b/index.php @@ -27,7 +27,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false @include(".htconfig.php"); -$lang = get_language(); +$lang = get_browser_language(); load_translation_table($lang); @@ -40,8 +40,8 @@ load_translation_table($lang); require_once("dba.php"); if(! $install) { -$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); - unset($db_host, $db_user, $db_pass, $db_data); + $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); + unset($db_host, $db_user, $db_pass, $db_data); /** * Load configs from db. Overwrite configs from .htconfig.php @@ -92,9 +92,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { load_translation_table($lang); } -if(x($_GET,'zrl')) { +if((x($_GET,'zrl')) && (! $install)) { $_SESSION['my_url'] = $_GET['zrl']; $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); + zrl_init($a); } /**