From: Max Semenik <maxsem.wiki@gmail.com>
Date: Sat, 10 Nov 2012 09:54:10 +0000 (+0530)
Subject: Make sure that SQLite uses no prefix
X-Git-Tag: 1.31.0-rc.0~21665^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=18e80879f2d1206c3d43d4f5bbe0610bfa5c1f62;p=lhc%2Fweb%2Fwiklou.git

Make sure that SQLite uses no prefix

Otherwise, when user selects MySQL, sets the prefix,
then switches  to SQLite, the tables will created with  prefix
however the prefix will be absent from LocalSettings, making the
wiki dead on arrival.

Change-Id: I6360af819f87b03c2e9967207c43bca95f931a00
---

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 6e1a74f61b..d8fa72441c 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -113,6 +113,8 @@ class SqliteInstaller extends DatabaseInstaller {
 			$dir = self::realpath( $dir );
 			$this->setVar( 'wgSQLiteDataDir', $dir );
 		}
+		# Table prefix is not used on SQLite, keep it empty
+		$this->setVar( 'wgDBprefix', '' );
 		return $result;
 	}