| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -478,7 +478,7 @@ |
| 479 | 479 | public function open( $server, $user, $password, $dbName ) |
| 480 | 480 | { |
| 481 | 481 | // Load the port number |
| 482 | | - global $wgDBport_db2, $wgDBcataloged; |
| | 482 | + global $wgDBport, $wgDBcataloged; |
| 483 | 483 | wfProfileIn( __METHOD__ ); |
| 484 | 484 | |
| 485 | 485 | // Load IBM DB2 driver if missing |
| — | — | @@ -499,7 +499,7 @@ |
| 500 | 500 | $this->close(); |
| 501 | 501 | // Cache conn info |
| 502 | 502 | $this->mServer = $server; |
| 503 | | - $this->mPort = $port = $wgDBport_db2; |
| | 503 | + $this->mPort = $port = $wgDBport; |
| 504 | 504 | $this->mUser = $user; |
| 505 | 505 | $this->mPassword = $password; |
| 506 | 506 | $this->mDBname = $dbName; |
| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -1859,7 +1859,7 @@ |
| 1860 | 1860 | } elseif( $conf->DBtype == 'ibm_db2' ) { |
| 1861 | 1861 | $dbsettings = |
| 1862 | 1862 | "# DB2 specific settings |
| 1863 | | -\$wgDBport_db2 = \"{$slconf['DBport_db2']}\"; |
| | 1863 | +\$wgDBport = \"{$slconf['DBport_db2']}\"; |
| 1864 | 1864 | \$wgDBmwschema = \"{$slconf['DBdb2schema']}\"; |
| 1865 | 1865 | \$wgDBcataloged = \"{$slconf['DBcataloged']}\";"; |
| 1866 | 1866 | } elseif( $conf->DBtype == 'oracle' ) { |