From fd57d8612864db1dd2f2b3791d31003367a91f24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Robert=20Stojni=C4=87?= Date: Sat, 2 Aug 2008 15:00:28 +0000 Subject: [PATCH] Another shot at bug 11035, added descriptive HTML title in standard page format. --- RELEASE-NOTES | 1 + includes/specials/SpecialSearch.php | 6 ++++-- languages/messages/MessagesEn.php | 1 + maintenance/language/messages.inc | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 32f1ac8c41..5f783166df 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -55,6 +55,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Not setting various parameters in Foreign Repos now fails more gracefully * (bug 2333) Redirects are properly rendered when previewing an edit. * (bug 14972) Use localized alias of Special:Search on all search forms +* (bug 11035) Special:Search should have descriptive === API changes in 1.14 === diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 35003598e0..9bfa07ea28 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -277,8 +277,10 @@ class SpecialSearch { */ function setupPage( $term ) { global $wgOut; - if( !empty( $term ) ) - $wgOut->setPageTitle( wfMsg( 'searchresults' ) ); + if( !empty( $term ) ){ + $wgOut->setPageTitle( wfMsg( 'searchresults') ); + $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term) ) ); + } $subtitlemsg = ( Title::newFromText( $term ) ? 'searchsubtitle' : 'searchsubtitleinvalid' ); $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) ); $wgOut->setArticleRelated( false ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index db990bcf55..8b5bfcc875 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1327,6 +1327,7 @@ Note that using the navigation links will reset this column.', # Search results 'searchresults' => 'Search results', +'searchresults-title' => 'Search results for $1', 'searchresulttext' => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].', 'searchsubtitle' => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|all pages starting with "$1"]] | [[Special:Whatlinkshere/$1|all pages that link to "$1"]])', 'searchsubtitleinvalid' => "You searched for '''$1'''", diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index ffa5b137b9..89d73e6ab3 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -692,6 +692,7 @@ $wgMessageStructure = array( ), 'search' => array( 'searchresults', + 'searchresults-title', 'searchresulttext', 'searchsubtitle', 'searchsubtitleinvalid', -- 2.20.1