Wrap 'searchresulttext' into a div with class

Redo of r45651: Now without breakage when the message text starts with line-start-markup such as a table or list.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 366abc8..716f471 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -80,6 +80,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7556) Time zone names in signatures lack i18n
 * (bug 3311) Automatic category redirects
 * (bug 17236) Suppress 'watch user page link' for IP range blocks
+* Wrap message 'searchresulttext' (Special:Search) into a div with
+  class "mw-searchresult"
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 764c2a0..e13a53a 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -931,7 +931,7 @@ class SpecialSearchOld {
                $search->showRedirects = $this->searchRedirects;
                $search->prefix = $this->mPrefix;
                $term = $search->transformSearchTerm($term);
-               
+
                $this->setupPage( $term );
 
                $rewritten = $search->replacePrefixes($term);
@@ -945,17 +945,17 @@ class SpecialSearchOld {
                                        'search'        => $textMatches->getSuggestionQuery(), 
                                        'fulltext'      => wfMsg('search')),
                                        $this->powerSearchOptions());
-                                       
+
                        $suggestLink = $sk->makeKnownLinkObj( $st,
                                $textMatches->getSuggestionSnippet(),
                                $stParams );
-                                       
+
                        $wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
                }
 
                $wgOut->addHTML( $extra );
 
-               $wgOut->addWikiMsg( 'searchresulttext' );
+               $wgOut->wrapWikiMsg( "<div class='mw-searchresult'>\n$1</div>", 'searchresulttext' );
 
                if( '' === trim( $term ) ) {
                        // Empty query -- straight view of search form