X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Finstaller%2FSqliteInstaller.php;h=c5c4a7cc148685ce25e32352bea6df0d123ae001;hb=9964ca1a390c446397dcd466916ffed356cdc3c9;hp=9bf87f4d5f390a5b378e61ef92d476a001860d70;hpb=2d16cb60693660ede0dc0eeff0970539a1053721;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 9bf87f4d5f..c5c4a7cc14 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -184,7 +184,7 @@ class SqliteInstaller extends DatabaseInstaller {
 		$dbName = $this->getVar( 'wgDBname' );
 		try {
 			# @todo FIXME: Need more sensible constructor parameters, e.g. single associative array
-			$db = DatabaseBase::factory( 'sqlite', [ 'dbname' => $dbName, 'dbDirectory' => $dir ] );
+			$db = Database::factory( 'sqlite', [ 'dbname' => $dbName, 'dbDirectory' => $dir ] );
 			$status->value = $db;
 		} catch ( DBConnectionError $e ) {
 			$status->fatal( 'config-sqlite-connection-error', $e->getMessage() );
@@ -239,7 +239,7 @@ class SqliteInstaller extends DatabaseInstaller {
 
 		# Create the global cache DB
 		try {
-			$conn = DatabaseBase::factory( 'sqlite', [ 'dbname' => 'wikicache', 'dbDirectory' => $dir ] );
+			$conn = Database::factory( 'sqlite', [ 'dbname' => 'wikicache', 'dbDirectory' => $dir ] );
 			# @todo: don't duplicate objectcache definition, though it's very simple
 			$sql =
 <<<EOT
@@ -261,6 +261,11 @@ EOT;
 		return $this->getConnection();
 	}
 
+	/**
+	 * @param $dir
+	 * @param $db
+	 * @return Status
+	 */
 	protected function makeStubDBFile( $dir, $db ) {
 		$file = DatabaseSqlite::generateFileName( $dir, $db );
 		if ( file_exists( $file ) ) {