From 8dfe9347aba6b9831e9d8e014769b116b263835d Mon Sep 17 00:00:00 2001 From: Purodha B Blissenbach Date: Tue, 19 Aug 2008 02:24:46 +0000 Subject: [PATCH] fix Bug 15240 Special:Search uses wrong data in PLURAL with MediaWiki:Showingresultstotal, introducing $4 = count of results on this page. --- includes/specials/SpecialSearch.php | 2 +- languages/messages/MessagesEn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 9bfa07ea28..904c2d845e 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -207,7 +207,7 @@ class SpecialSearch { if ( $num > 0 ) { if ( $totalNum > 0 ){ $top = wfMsgExt('showingresultstotal', array( 'parseinline' ), - $this->offset+1, $this->offset+$num, $totalNum ); + $this->offset+1, $this->offset+$num, $totalNum, $num ); } elseif ( $num >= $this->limit ) { $top = wfShowingResults( $this->offset, $this->limit ); } else { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index fa42700eb9..f96ace69fb 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1362,7 +1362,7 @@ You can [[:\$1|create this page]].", 'searchall' => 'all', 'showingresults' => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.", 'showingresultsnum' => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.", -'showingresultstotal' => "Showing below {{PLURAL:$3|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}", +'showingresultstotal' => "Showing below {{PLURAL:$4|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}", 'nonefound' => "'''Note''': Only some namespaces are searched by default. Try prefixing your query with ''all:'' to search all content (including talk pages, templates, etc), or use the desired namespace as prefix.", 'powersearch' => 'Advanced search', -- 2.20.1