| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -999,7 +999,7 @@ |
| 1000 | 1000 | } |
| 1001 | 1001 | |
| 1002 | 1002 | function setup_database() { |
| 1003 | | - $res = $this->sourceFile( "../maintenance/ora/tables.sql" ); |
| | 1003 | + $res = $this->sourceFile( "../maintenance/oracle/tables.sql" ); |
| 1004 | 1004 | if ( $res === true ) { |
| 1005 | 1005 | print " done.</li>\n"; |
| 1006 | 1006 | } else { |
| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -1042,7 +1042,7 @@ |
| 1043 | 1043 | echo "<li>Connect failed.</li>"; |
| 1044 | 1044 | if ($useRoot) { |
| 1045 | 1045 | if (ini_get('oci8.privileged_connect') === false) { |
| 1046 | | - echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/ora/user.sql script manually prior to continuing.</li>"; |
| | 1046 | + echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/oracle/user.sql script manually prior to continuing.</li>"; |
| 1047 | 1047 | $ok = false; |
| 1048 | 1048 | } else { |
| 1049 | 1049 | $wgDBadminuser = $conf->RootUser; |
| — | — | @@ -1052,7 +1052,7 @@ |
| 1053 | 1053 | if ($wgDatabase->isOpen()) { |
| 1054 | 1054 | $wgDBOracleDefTS = $conf->DBdefTS_ora; |
| 1055 | 1055 | $wgDBOracleTempTS = $conf->DBtempTS_ora; |
| 1056 | | - $res = $wgDatabase->sourceFile( "../maintenance/ora/user.sql" ); |
| | 1056 | + $res = $wgDatabase->sourceFile( "../maintenance/oracle/user.sql" ); |
| 1057 | 1057 | if ($res !== true) dieout($res); |
| 1058 | 1058 | } else { |
| 1059 | 1059 | echo "<li>Invalid database superuser, please supply a valid superuser account.</li>"; |