From 50359b0f48a1787993007d0e7cbf8e4c7937c274 Mon Sep 17 00:00:00 2001 From: Ilmari Karonen Date: Sun, 2 Jul 2006 22:50:52 +0000 Subject: [PATCH] "searchsubtitleinvalid" message for searches that are not valid titles --- RELEASE-NOTES | 1 + includes/AjaxFunctions.php | 5 ++++- includes/SpecialSearch.php | 3 ++- languages/Messages.php | 1 + languages/MessagesAf.php | 1 + languages/MessagesAr.php | 1 + languages/MessagesBg.php | 1 + languages/MessagesBr.php | 1 + languages/MessagesBs.php | 1 + languages/MessagesCa.php | 1 + languages/MessagesCs.php | 1 + languages/MessagesCy.php | 1 + languages/MessagesDe.php | 1 + languages/MessagesEl.php | 1 + languages/MessagesEo.php | 1 + languages/MessagesEs.php | 1 + languages/MessagesEt.php | 1 + languages/MessagesFa.php | 1 + languages/MessagesFi.php | 1 + languages/MessagesFr.php | 1 + languages/MessagesFur.php | 1 + languages/MessagesFy.php | 1 + languages/MessagesGa.php | 1 + languages/MessagesGsw.php | 1 + languages/MessagesHe.php | 1 + languages/MessagesHr.php | 1 + languages/MessagesHu.php | 1 + languages/MessagesIa.php | 1 + languages/MessagesId.php | 1 + languages/MessagesIs.php | 1 + languages/MessagesIt.php | 1 + languages/MessagesJa.php | 1 + languages/MessagesKo.php | 1 + languages/MessagesKu.php | 1 + languages/MessagesLa.php | 1 + languages/MessagesLi.php | 1 + languages/MessagesLt.php | 1 + languages/MessagesLv.php | 1 + languages/MessagesMk.php | 1 + languages/MessagesMs.php | 1 + languages/MessagesNds.php | 1 + languages/MessagesNl.php | 1 + languages/MessagesNn.php | 1 + languages/MessagesNo.php | 1 + languages/MessagesOc.php | 1 + languages/MessagesPl.php | 1 + languages/MessagesPms.php | 1 + languages/MessagesPt.php | 1 + languages/MessagesPt_br.php | 1 + languages/MessagesRo.php | 1 + languages/MessagesRu.php | 1 + languages/MessagesSc.php | 1 + languages/MessagesSk.php | 1 + languages/MessagesSl.php | 1 + languages/MessagesSq.php | 1 + languages/MessagesSr_ec.php | 1 + languages/MessagesSr_el.php | 1 + languages/MessagesSu.php | 1 + languages/MessagesSv.php | 1 + languages/MessagesTa.php | 1 + languages/MessagesTr.php | 3 ++- languages/MessagesUk.php | 1 + languages/MessagesVi.php | 1 + languages/MessagesWa.php | 1 + languages/MessagesYi.php | 1 + languages/MessagesZh_cn.php | 1 + languages/MessagesZh_tw.php | 1 + 67 files changed, 72 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index a0ae8d912a..0bbdc2b9b4 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -633,6 +633,7 @@ Some default configuration options have changed: * Introduce updateArticleCount maintenance script which uses a better check that reflects what Article::isCountable() tests for * Introduce 'BadImage' hook; see docs/hooks.txt for more information +* Add "searchsubtitleinvalid" message for searches that are not valid titles. == Compatibility == diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php index 28b01eec2c..7ee4a3ef43 100644 --- a/includes/AjaxFunctions.php +++ b/includes/AjaxFunctions.php @@ -136,11 +136,14 @@ function wfSajaxSearch( $term ) { $more = ''; } + $subtitlemsg = ( Title::newFromtext($term) ? 'searchsubtitle' : 'searchsubtitleinvalid' ); + $subtitle = $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ); + $term = htmlspecialchars( $term ); return '
' . wfMsg( 'hideresults' ) . '
' . '

'.wfMsg('search') - . '

'. $wgOut->parse( wfMsg( 'searchsubtitle', $term ) ) . '