From 4b8cd4db88321e47e8e267377834abf27356c721 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Mon, 2 Feb 2009 17:52:26 +0000 Subject: [PATCH] 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. --- RELEASE-NOTES | 2 ++ includes/specials/SpecialSearch.php | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 366abc8753..716f4711de 100644 --- 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 764c2a04df..e13a53a8ad 100644 --- 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('
'.wfMsg('search-suggest',$suggestLink).'
'); } $wgOut->addHTML( $extra ); - $wgOut->addWikiMsg( 'searchresulttext' ); + $wgOut->wrapWikiMsg( "
\n$1
", 'searchresulttext' ); if( '' === trim( $term ) ) { // Empty query -- straight view of search form -- 2.20.1