From 1374598e3827d832a9b71b786fb92f248cc6e1e3 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 7 Sep 2010 12:48:48 +0000
Subject: [PATCH] Followup r72535, I suppose I shouldn't break the old
 installer yet

---
 config/Installer.php           | 4 ++--
 includes/db/DatabaseOracle.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/Installer.php b/config/Installer.php
index 20526a16e6..17332f3420 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -1042,7 +1042,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 				echo "<li>Connect failed.</li>";
 				if ($useRoot) {
 					if (ini_get('oci8.privileged_connect') === false) {
-						echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/ora/user.sql script manually prior to continuing.</li>";
+						echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/oracle/user.sql script manually prior to continuing.</li>";
 						$ok = false;
 					} else {
 						$wgDBadminuser = $conf->RootUser;
@@ -1052,7 +1052,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 						if ($wgDatabase->isOpen()) {
 							$wgDBOracleDefTS = $conf->DBdefTS_ora;
 							$wgDBOracleTempTS = $conf->DBtempTS_ora;
-							$res = $wgDatabase->sourceFile( "../maintenance/ora/user.sql"  );
+							$res = $wgDatabase->sourceFile( "../maintenance/oracle/user.sql"  );
 							if ($res !== true) dieout($res);
 						} else {
 							echo "<li>Invalid database superuser, please supply a valid superuser account.</li>";
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index df1593f12e..40cd180da8 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -999,7 +999,7 @@ class DatabaseOracle extends DatabaseBase {
 	}
 
 	function setup_database() {
-		$res = $this->sourceFile( "../maintenance/ora/tables.sql" );
+		$res = $this->sourceFile( "../maintenance/oracle/tables.sql" );
 		if ( $res === true ) {
 			print " done.</li>\n";
 		} else {
-- 
2.20.1