mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23326 from owncloud/manishbisht-combined-database-errors 

[CI] Installation: Combined database errors
This commit is contained in:
Thomas Müller 2016-03-17 09:33:26 +01:00
parent b5c56a7322 07e7d4836e
commit 48a7f126fd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/setup/abstractdatabase.php
View File

@ -59,10 +59,11 @@ abstract class AbstractDatabase {
public function validate($config) {
$errors = array();
if(empty($config['dbuser'])) {
if(empty($config['dbuser']) && empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
} else if(empty($config['dbuser'])) {
$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
}
if(empty($config['dbname'])) {
} else if(empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
}
if(substr_count($config['dbname'], '.') >= 1) {

7
lib/private/setup/oci.php
View File

@ -50,10 +50,11 @@ class OCI extends AbstractDatabase {
public function validate($config) {
$errors = array();
if(empty($config['dbuser'])) {
if(empty($config['dbuser']) && empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
} else if(empty($config['dbuser'])) {
$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
}
if(empty($config['dbname'])) {
} else if(empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
}
return $errors;