Cleanup r80892, r84485: Check user also in sqlite for consistency.

diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php
index 941a66f..810b823 100644 (file)
--- 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 09b8750..1b57fd8 100644 (file)
--- 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 );