fix Bug 15240 Special:Search uses wrong data in PLURAL

with MediaWiki:Showingresultstotal, introducing $4 = count of results on
this page.

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 9bfa07e..904c2d8 100644 (file)
--- 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 fa42700..f96ace6 100644 (file)
--- 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',