Merge commit 'upstream/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/index.php b/index.php
index 5dd93523e..442173eeb 100644
--- a/index.php
+++ b/index.php
@@ -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
@@ -95,6 +95,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 if(x($_GET,'zrl')) {
 	$_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);
+	}
 }
 
 /**