https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112502
Revision: 112502
Author: freakolowsky
Date: 2012-02-27 19:01:10 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
* partly fixes two issues exposed by bug 34280
** forcing recreate if creating user
** parent::createTables was setting DB to a wrong setting
Modified Paths:
--------------
trunk/phase3/includes/installer/OracleInstaller.php
Modified: trunk/phase3/includes/installer/OracleInstaller.php
===================================================================
--- trunk/phase3/includes/installer/OracleInstaller.php 2012-02-27 18:59:37 UTC
(rev 112501)
+++ trunk/phase3/includes/installer/OracleInstaller.php 2012-02-27 19:01:10 UTC
(rev 112502)
@@ -230,6 +230,8 @@
// 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 @@
*/
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 );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
