correct db-exists check in installation-process
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
@@ -791,7 +791,8 @@ class FroxlorInstall
|
|||||||
$tables_exist = true;
|
$tables_exist = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tables_exist && (int)$this->_data['mysql_forcecreate'] > 0) {
|
if ($tables_exist) {
|
||||||
|
if ((int)$this->_data['mysql_forcecreate'] > 0) {
|
||||||
// set status
|
// set status
|
||||||
$content .= $this->_status_message('orange', 'exists (' . $this->_data['mysql_database'] . ')');
|
$content .= $this->_status_message('orange', 'exists (' . $this->_data['mysql_database'] . ')');
|
||||||
// tell what's going on
|
// tell what's going on
|
||||||
@@ -834,6 +835,7 @@ class FroxlorInstall
|
|||||||
$content .= $this->_status_message('red', $this->_lng['install']['db_exists']);
|
$content .= $this->_status_message('red', $this->_lng['install']['db_exists']);
|
||||||
$this->_abort = true;
|
$this->_abort = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user