Merge branch 'master' of github.com:annando/friendica

1 files changed, 3 insertions, 6 deletions

diff --git a/index.php b/index.php
index 442173eeb..94329eedc 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);
 
@@ -92,13 +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);
-	if(! $install) {
-		$arr = array('zrl' => $_SESSION['my_url'], 'url' => $a->cmd);
-		call_hooks('zrl_init',$arr);
-	}
+	zrl_init($a);
 }
 
 /**