X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=6962ff2ddaf531ff87cb382ffc88ea01e03cd908;hb=4d5b79a9d46ad07716febaac02e59dafe3baad90;hp=4596f9a251a552573d31787ff11eeb8016953ece;hpb=c598bf7d8f5075526fadcfd329f6dd448533dfad;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index 4596f9a251..6962ff2dda 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -67,12 +67,11 @@ function install_post(App $a) {
 			$timezone = notags(trim($_POST['timezone']));
 			$language = notags(trim($_POST['language']));
 			$adminmail = notags(trim($_POST['adminmail']));
-			$rino = 1;
 
 			// connect to db
 			dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
 
-			Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino);
+			Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
 
 			return;
 		break;
@@ -140,9 +139,7 @@ function install_content(App $a) {
 	switch ($install_wizard_pass) {
 		case 1: { // System check
 
-			if (x($_POST, 'phpath')) {
-				$phpath = notags(trim($_POST['phpath']));
-			}
+			$phpath = defaults($_POST, 'phpath', 'php');
 
 			list($checks, $checkspassed) = Install::check($phpath);
 
@@ -245,7 +242,7 @@ function install_content(App $a) {
 
 function manual_config(App $a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT, 'UTF-8');
-	$o = L10n::t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
+	$o = L10n::t('The database configuration file "config/local.ini.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
 	$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
 	return $o;
 }