From 2ef6ad80a4f7374e0488b8b10b8139e3392f81ff Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 2 Dec 2010 17:31:48 -0800 Subject: fix installation into subdir of domain --- mod/install.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mod/install.php') diff --git a/mod/install.php b/mod/install.php index 21a1b7513..9043459b8 100644 --- a/mod/install.php +++ b/mod/install.php @@ -5,6 +5,7 @@ function install_post(&$a) { global $db; + $urlpath = $a->get_path(); $dbhost = notags(trim($_POST['dbhost'])); $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); @@ -40,6 +41,7 @@ function install_post(&$a) { '$dbpass' => $dbpass, '$dbdata' => $dbdata, '$timezone' => $timezone, + '$urlpath' => $urlpath, '$phpath' => $phpath )); $result = file_put_contents('.htconfig.php', $txt); @@ -102,6 +104,7 @@ function install_content(&$a) { $tpl = load_view_file('view/install_db.tpl'); $o .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()), '$submit' => t('Submit'), '$dbhost' => ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'), -- cgit v1.2.3