Merge "Fixed getDBname() for DatabaseSQLite"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 31 Jan 2014 23:47:16 +0000 (23:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 31 Jan 2014 23:47:16 +0000 (23:47 +0000)
includes/db/DatabaseSqlite.php

index 5aaeb65..fa827d1 100644 (file)
@@ -38,12 +38,6 @@ class DatabaseSqlite extends DatabaseBase {
        /** @var resource */
        protected $mLastResult;
 
-       /**
-        * @var string
-        * @todo Seems to serve no purpose. Remove?
-        */
-       private $mName;
-
        /** @var PDO */
        protected $mConn;
 
@@ -63,7 +57,7 @@ class DatabaseSqlite extends DatabaseBase {
                                'foreign' => isset( $args[6] ) ? $args[6] : false
                        );
                }
-               $this->mName = $p['dbname'];
+               $this->mDBname = $p['dbname'];
                parent::__construct( $p );
                // parent doesn't open when $user is false, but we can work with $dbName
                if ( $p['dbname'] && !$this->isOpen() ) {