(bug 22308) Search should find text in default main page immediately after setup...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2a38a1d..6cd1e50 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -372,6 +372,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   $wgGroupPermissions now appear on Special:ListGroupRights
 * (bug 23923) Special:Prefixindex no longer shows results if nothing was
   requested.
+* (bug 22308) Search now finds text in default main page immediately after setup
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index ca10131..436dc27 100644 (file)
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -444,12 +444,13 @@ abstract class CoreInstaller extends Installer {
                try {
                        $titleobj = Title::newFromText( wfMsgForContent( "mainpage" ) );
                        $article = new Article( $titleobj );
-                       $article->doEdit( wfMsgForContent( 'mainpagetext' ) . "\n\n" .
-                                                               wfMsgForContent( 'mainpagedocfooter' ),
-                                                               '',
-                                                               EDIT_NEW,
-                                                               false,
-                                                               User::newFromName( 'MediaWiki Default' ) );
+                       $text = wfMsgForContent( 'mainpagetext' ) . "\n\n" .
+                               wfMsgForContent( 'mainpagedocfooter' );
+                       $article->doEdit( $text, '', EDIT_NEW, false,
+                               User::newFromName( 'MediaWiki Default' ) );
+                       $u = new SearchUpdate( $titleobj->getArticleID(),
+                               $titleobj->getPrefixedDBkey(), $text );
+                       $u->doUpdate();
                } catch (MWException $e) {
                        //using raw, because $wgShowExceptionDetails can not be set yet
                        $status->fatal( 'config-install-mainpage-failed', $e->getMessage() );