r46720 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r46719‎ | r46720 | r46721 >
Date:17:52, 2 February 2009
Author:raymond
Status:deferred
Tags:
Comment:
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.
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/specials/SpecialSearch.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialSearch.php
@@ -931,7 +931,7 @@
932932 $search->showRedirects = $this->searchRedirects;
933933 $search->prefix = $this->mPrefix;
934934 $term = $search->transformSearchTerm($term);
935 -
 935+
936936 $this->setupPage( $term );
937937
938938 $rewritten = $search->replacePrefixes($term);
@@ -945,17 +945,17 @@
946946 'search' => $textMatches->getSuggestionQuery(),
947947 'fulltext' => wfMsg('search')),
948948 $this->powerSearchOptions());
949 -
 949+
950950 $suggestLink = $sk->makeKnownLinkObj( $st,
951951 $textMatches->getSuggestionSnippet(),
952952 $stParams );
953 -
 953+
954954 $wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
955955 }
956956
957957 $wgOut->addHTML( $extra );
958958
959 - $wgOut->addWikiMsg( 'searchresulttext' );
 959+ $wgOut->wrapWikiMsg( "<div class='mw-searchresult'>\n$1</div>", 'searchresulttext' );
960960
961961 if( '' === trim( $term ) ) {
962962 // Empty query -- straight view of search form
Index: trunk/phase3/RELEASE-NOTES
@@ -80,6 +80,8 @@
8181 * (bug 7556) Time zone names in signatures lack i18n
8282 * (bug 3311) Automatic category redirects
8383 * (bug 17236) Suppress 'watch user page link' for IP range blocks
 84+* Wrap message 'searchresulttext' (Special:Search) into a div with
 85+ class "mw-searchresult"
8486
8587 === Bug fixes in 1.15 ===
8688 * (bug 16968) Special:Upload no longer throws useless warnings.

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45651Wrap 'searchresulttext' into a div with classraymond20:11, 10 January 2009

Status & tagging log