From e42c970e2d65a723d4aebc8ac6e5ea939c1dd695 Mon Sep 17 00:00:00 2001 From: Jure Kajzer Date: Mon, 27 Feb 2012 19:01:10 +0000 Subject: [PATCH] * partly fixes two issues exposed by bug 34280 ** forcing recreate if creating user ** parent::createTables was setting DB to a wrong setting --- includes/installer/OracleInstaller.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index b457033b7b..50f18c9731 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -230,6 +230,8 @@ class OracleInstaller extends DatabaseInstaller { // user created or already existing, switching back to a normal connection // as the new user has all needed privileges to setup the rest of the schema // i will be using that user as _InstallUser from this point on + $this->db->close(); + $this->db = false; $this->parent->setVar( '_InstallUser', $this->getVar( 'wgDBuser' ) ); $this->parent->setVar( '_InstallPassword', $this->getVar( 'wgDBpassword' ) ); $this->parent->setVar( '_InstallDBname', $this->getVar( 'wgDBuser' ) ); @@ -245,8 +247,8 @@ class OracleInstaller extends DatabaseInstaller { */ public function createTables() { $this->setupSchemaVars(); - $this->db->selectDB( $this->getVar( 'wgDBuser' ) ); $this->db->setFlag( DBO_DDLMODE ); + $this->parent->setVar( 'wgDBname', $this->getVar( 'wgDBuser' ) ); $status = parent::createTables(); $this->db->clearFlag( DBO_DDLMODE ); -- 2.20.1