Improve Addons documentation

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 49d03abcd3cd1b626c18756fda742c79f7e8f3cb..4596f9a251a552573d31787ff11eeb8016953ece 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -25,6 +25,8 @@ function install_init(App $a) {
        $a->config['system']['theme'] = "../install";
        $a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
 
+       Install::setInstallMode();
+
        global $install_wizard_pass;
        if (x($_POST, 'pass')) {
                $install_wizard_pass = intval($_POST['pass']);
@@ -49,7 +51,7 @@ function install_post(App $a) {
                        $phpath = notags(trim($_POST['phpath']));
 
                        require_once("include/dba.php");
-                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true)) {
+                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
                                $a->data['db_conn_failed'] = true;
                        }
 
@@ -68,7 +70,7 @@ function install_post(App $a) {
                        $rino = 1;
 
                        // connect to db
-                       dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true);
+                       dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
 
                        Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino);
 
@@ -243,7 +245,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 "config/".');
+       $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 .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
        return $o;
 }