Kill $wgDBport_db2

diff --git a/config/Installer.php b/config/Installer.php
index 2bf20c9..690268f 100644 (file)
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -1859,7 +1859,7 @@ function writeLocalSettings( $conf ) {
        } elseif( $conf->DBtype == 'ibm_db2' ) {
                $dbsettings =
 "# DB2 specific settings
-\$wgDBport_db2       = \"{$slconf['DBport_db2']}\";
+\$wgDBport       = \"{$slconf['DBport_db2']}\";
 \$wgDBmwschema       = \"{$slconf['DBdb2schema']}\";
 \$wgDBcataloged      = \"{$slconf['DBcataloged']}\";";
        } elseif( $conf->DBtype == 'oracle' ) {

diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php
index bcae449..2f1b1c1 100644 (file)
--- a/includes/db/DatabaseIbm_db2.php
+++ b/includes/db/DatabaseIbm_db2.php
@@ -478,7 +478,7 @@ class DatabaseIbm_db2 extends DatabaseBase {
        public function open( $server, $user, $password, $dbName )
        {
                // Load the port number
-               global $wgDBport_db2, $wgDBcataloged;
+               global $wgDBport, $wgDBcataloged;
                wfProfileIn( __METHOD__ );
                
                // Load IBM DB2 driver if missing
@@ -499,7 +499,7 @@ class DatabaseIbm_db2 extends DatabaseBase {
                $this->close();
                // Cache conn info
                $this->mServer = $server;
-               $this->mPort = $port = $wgDBport_db2;
+               $this->mPort = $port = $wgDBport;
                $this->mUser = $user;
                $this->mPassword = $password;
                $this->mDBname = $dbName;