Another shot at bug 11035, added descriptive HTML title in standard page format.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 32f1ac8..5f78316 100644 (file)
--- 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 <title>
 
 === API changes in 1.14 ===
 

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 3500359..9bfa07e 100644 (file)
--- 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 db990bc..8b5bfcc 100644 (file)
--- 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 ffa5b13..89d73e6 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -692,6 +692,7 @@ $wgMessageStructure = array(
        ),
        'search' => array(
                'searchresults',
+               'searchresults-title',
                'searchresulttext',
                'searchsubtitle',
                'searchsubtitleinvalid',