diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
commit | 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (patch) | |
tree | 577a29fb579188d16003a209ce2a2e9c5b0aa2bd /includes/installer/SqliteInstaller.php | |
parent | cacc939b34e315b85e2d72997811eb6677996cc1 (diff) |
Update to MediaWiki 1.21.1
Diffstat (limited to 'includes/installer/SqliteInstaller.php')
-rw-r--r-- | includes/installer/SqliteInstaller.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php index 6e1a74f6..68df6ab2 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; } @@ -238,7 +240,7 @@ class SqliteInstaller extends DatabaseInstaller { $module = DatabaseSqlite::getFulltextSearchModule(); $fts3tTable = $this->db->checkForEnabledSearch(); - if ( $fts3tTable && !$module ) { + if ( $fts3tTable && !$module ) { $status->warning( 'config-sqlite-fts3-downgrade' ); $this->db->sourceFile( "$IP/maintenance/sqlite/archives/searchindex-no-fts.sql" ); } elseif ( !$fts3tTable && $module == 'FTS3' ) { @@ -254,6 +256,6 @@ class SqliteInstaller extends DatabaseInstaller { $dir = LocalSettingsGenerator::escapePhpString( $this->getVar( 'wgSQLiteDataDir' ) ); return "# SQLite-specific settings -\$wgSQLiteDataDir = \"{$dir}\";"; +\$wgSQLiteDataDir = \"{$dir}\";"; } } |