| Index: trunk/phase3/config/index.php |
| — | — | @@ -500,7 +500,6 @@ |
| 501 | 501 | } |
| 502 | 502 | print "<li>Database type: {$conf->DBtype}</li>\n"; |
| 503 | 503 | $dbclass = 'Database'.ucfirst($conf->DBtype); |
| 504 | | - require_once("$dbclass.php"); |
| 505 | 504 | $wgDBtype = $conf->DBtype; |
| 506 | 505 | $wgDBadminuser = "root"; |
| 507 | 506 | $wgDBadminpassword = $conf->RootPW; |
| — | — | @@ -550,7 +549,7 @@ |
| 551 | 550 | $wgDBadminpassword = $db_pass; |
| 552 | 551 | echo( "success.</li>\n" ); |
| 553 | 552 | $wgDatabase->ignoreErrors( true ); |
| 554 | | - $myver = mysql_get_server_info( $wgDatabase->mConn ); |
| | 553 | + $myver = $wgDatabase->getServerVersion(); |
| 555 | 554 | } else { |
| 556 | 555 | # There were errors, report them and back out |
| 557 | 556 | $ok = false; |
| — | — | @@ -620,7 +619,7 @@ |
| 621 | 620 | } |
| 622 | 621 | print "</li>\n"; |
| 623 | 622 | |
| 624 | | - @$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn ); |
| | 623 | + @$sel = $wgDatabase->selectDB( $wgDBname ); |
| 625 | 624 | if( $sel ) { |
| 626 | 625 | print "<li>Database <tt>" . htmlspecialchars( $wgDBname ) . "</tt> exists</li>\n"; |
| 627 | 626 | } else { |
| — | — | @@ -1424,15 +1423,6 @@ |
| 1425 | 1424 | return false; |
| 1426 | 1425 | } |
| 1427 | 1426 | |
| 1428 | | -function get_db_version() { |
| 1429 | | - global $wgDatabase, $conf; |
| 1430 | | - if ($conf->DBtype == 'mysql') |
| 1431 | | - return mysql_get_server_info( $wgDatabase->mConn ); |
| 1432 | | - else if ($conf->DBtype == 'oracle') |
| 1433 | | - return oci_server_version($wgDatabase->mConn); |
| 1434 | | - else return 'unknown'; |
| 1435 | | -} |
| 1436 | | - |
| 1437 | 1427 | # Test a memcached server |
| 1438 | 1428 | function testMemcachedServer( $server ) { |
| 1439 | 1429 | $hostport = explode(":", $server); |
| Index: trunk/phase3/includes/AutoLoader.php |
| — | — | @@ -45,6 +45,7 @@ |
| 46 | 46 | 'WordLevelDiff' => 'DifferenceEngine.php', |
| 47 | 47 | 'TableDiffFormatter' => 'DifferenceEngine.php', |
| 48 | 48 | 'EditPage' => 'EditPage.php', |
| | 49 | + 'MWException' => 'Exception.php', |
| 49 | 50 | 'Exif' => 'Exif.php', |
| 50 | 51 | 'FormatExif' => 'Exif.php', |
| 51 | 52 | 'WikiExporter' => 'Export.php', |