X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Finstaller%2FSqliteInstaller.php;h=7c39dedae411101a989f3ad43e4dd5db849d8a21;hb=31dfe22853bf9ccd0d4e8f6d29ec9148e63fb980;hp=17332ff59c0fa64c8128712324daae583aeacf48;hpb=78c11f067909b6b7424f68ead29075619556a243;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 17332ff59c..7c39dedae4 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -356,7 +356,14 @@ EOT;
 		global $IP;
 
 		$module = DatabaseSqlite::getFulltextSearchModule();
-		$fts3tTable = $this->db->checkForEnabledSearch();
+		$searchIndexSql = (string)$this->db->selectField(
+			$this->db->addIdentifierQuotes( 'sqlite_master' ),
+			'sql',
+			[ 'tbl_name' => $this->db->tableName( 'searchindex', 'raw' ) ],
+			__METHOD__
+		);
+		$fts3tTable = ( stristr( $searchIndexSql, 'fts' ) !== false );
+
 		if ( $fts3tTable && !$module ) {
 			$status->warning( 'config-sqlite-fts3-downgrade' );
 			$this->db->sourceFile( "$IP/maintenance/sqlite/archives/searchindex-no-fts.sql" );
@@ -406,6 +413,7 @@ EOT;
 		'type' => 'sqlite',
 		'dbname' => \"{\$wgDBname}_jobqueue\",
 		'tablePrefix' => '',
+		'variables' => [ 'synchronous' => 'NORMAL' ],
 		'dbDirectory' => \$wgSQLiteDataDir,
 		'trxMode' => 'IMMEDIATE',
 		'flags' => 0