Followup r72535, I suppose I shouldn't break the old installer yet

diff --git a/config/Installer.php b/config/Installer.php
index 20526a1..17332f3 100644 (file)
--- 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 df1593f..40cd180 100644 (file)
--- 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 {