Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 22:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5819 from JonnyTischbein/issue_install_db_inuse

Browse source 
Install: After detecting DB already in use, go back to db_stettings with error
This commit is contained in:
Hypolite Petovan 2018-10-04 15:51:14 -04:00 committed by GitHub
commit 0589d9ed2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/install.php
View 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.');
}
}