From c3aeca8380e7d50e2f44af11e53bf6d7d8d76e05 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 22 Mar 2011 15:59:50 +0000 Subject: [PATCH] Cleanup r80892, r84485: Check user also in sqlite for consistency. --- includes/db/DatabaseIbm_db2.php | 5 ----- includes/db/DatabaseSqlite.php | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php index 941a66fda5..810b823431 100644 --- a/includes/db/DatabaseIbm_db2.php +++ b/includes/db/DatabaseIbm_db2.php @@ -245,11 +245,6 @@ class DatabaseIbm_db2 extends DatabaseBase { return 'ibm_db2'; } - ###################################### - # Setup - ###################################### - - /** * * @param $server String: hostname of database server diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index 09b87507c5..1b57fd88af 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -26,8 +26,8 @@ class DatabaseSqlite extends DatabaseBase { function __construct( $server = false, $user = false, $password = false, $dbName = false, $flags = 0 ) { $this->mName = $dbName; parent::__construct( $server, $user, $password, $dbName, $flags ); - // parent doesn't open when $server is false, but we can work with $dbName - if( !$server && $dbName ) { + // parent doesn't open when $user is false, but we can work with $dbName + if( !$user && $dbName ) { global $wgSharedDB; if( $this->open( $server, $user, $password, $dbName ) && $wgSharedDB ) { $this->attachDatabase( $wgSharedDB ); -- 2.20.1