]> git.mxchange.org Git - friendica.git/commitdiff
Install: After detecting DB already in use, go back to db_stettings with error
authorJonny Tischbein <jonny_tischbein@systemli.org>
Thu, 4 Oct 2018 16:53:52 +0000 (18:53 +0200)
committerJonny Tischbein <jonny_tischbein@systemli.org>
Thu, 4 Oct 2018 16:53:52 +0000 (18:53 +0200)
mod/install.php

index d2d322b3b93cdb7eb83805c72bded8e636d64029..8355f61300de5031c38cf61249013263d023407b 100644 (file)
@@ -125,13 +125,8 @@ function install_content(App $a) {
        if (DBA::$connected) {
                $r = q("SELECT COUNT(*) as `total` FROM `user`");
                if (DBA::isResult($r) && $r[0]['total']) {
-                       $tpl = get_markup_template('install.tpl');
-                       return replace_macros($tpl, [
-                               '$title' => $install_title,
-                               '$pass' => '',
-                               '$status' => L10n::t('Database already in use.'),
-                               '$text' => '',
-                       ]);
+                $install_wizard_pass = 2;
+                $wizard_status = L10n::t('Database already in use.');
                }
        }