From 07e7d4836e747f7199170f21455d20143bbcb0b0 Mon Sep 17 00:00:00 2001
From: Manish Bisht <manish.bisht490@gmail.com>
Date: Mon, 14 Mar 2016 21:30:59 +0530
Subject: [PATCH] Update oci.php

Error Fixed

combined the database errors

Merged Database Errors
---
 lib/private/setup/abstractdatabase.php | 7 ++++---
 lib/private/setup/oci.php              | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 0c1e5904e0..90203b67c1 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -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) {
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index 3d5aca96c1..a398876ad1 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -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;