http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74109

Revision: 74109
Author:   maxsem
Date:     2010-10-01 21:06:32 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
Installer: added an environment check for SQLite search capabilities

Modified Paths:
--------------
    trunk/phase3/includes/installer/Installer.i18n.php
    trunk/phase3/includes/installer/Installer.php

Modified: trunk/phase3/includes/installer/Installer.i18n.php
===================================================================
--- trunk/phase3/includes/installer/Installer.i18n.php  2010-10-01 20:56:39 UTC 
(rev 74108)
+++ trunk/phase3/includes/installer/Installer.i18n.php  2010-10-01 21:06:32 UTC 
(rev 74109)
@@ -96,6 +96,8 @@
 If you compiled PHP yourself, reconfigure it with a database client enabled, 
for example using <code>./configure --with-mysql</code>.
 If you installed PHP from a Debian or Ubuntu package, then you also need 
install the php5-mysql module.',
        'config-have-db'                  => 'Found database 
{{PLURAL:$2|driver|drivers}}: $1.',
+       'config-have-fts3'                => 'SQLite is compiled with the 
[http://sqlite.org/fts3.html FTS3] module, search features will be available on 
this backend.',
+       'config-no-fts3'                  => "'''Warning''': SQLite is compiled 
without the [http://sqlite.org/fts3.html FTS3] module, search features will be 
unavailable on this backend.",
        'config-register-globals'         => "'''Warning: PHP's 
<code>[http://php.net/register_globals register_globals]</code> option is 
enabled.'''
 '''Disable it if you can.'''
 MediaWiki will work, but your server is exposed to potential security 
vulnerabilities.",

Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php       2010-10-01 20:56:39 UTC 
(rev 74108)
+++ trunk/phase3/includes/installer/Installer.php       2010-10-01 21:06:32 UTC 
(rev 74109)
@@ -443,6 +443,16 @@
                }
 
                $this->showMessage( 'config-have-db', $wgLang->listToText( 
$goodNames ), count( $goodNames ) );
+
+               // Check for FTS3 full-text search module
+               $sqlite = $this->getDBInstaller( $name );
+               if ( $sqlite->isCompiled() ) {
+                       $db = new DatabaseSqliteStandalone( ':memory:' );
+                       $this->showMessage( $db->getFulltextSearchModule() == 
'FTS3'
+                               ? 'config-have-fts3'
+                               : 'config-no-fts3'
+                       );
+               }
        }
 
        /**



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to