Move wfShowingResultsNum() back into SpecialSearch where it belongs. No need for...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6d91732..367be73 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1476,25 +1476,6 @@ function wfShowingResults( $offset, $limit ) {
        );
 }
 
-/**
- * @todo document
- *
- * @param $offset Int
- * @param $limit Int
- * @param $num Int
- * @return String
- */
-function wfShowingResultsNum( $offset, $limit, $num ) {
-       global $wgLang;
-       return wfMsgExt(
-               'showingresultsnum',
-               array( 'parseinline' ),
-               $wgLang->formatNum( $limit ),
-               $wgLang->formatNum( $offset + 1 ),
-               $wgLang->formatNum( $num )
-       );
-}
-
 /**
  * Generate (prev x| next x) (20|50|100...) type links for paging
  *

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 0534abf..2d1dba1 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -986,7 +986,11 @@ class SpecialSearch extends SpecialPage {
                        } elseif ( $resultsShown >= $this->limit ) {
                                $top = wfShowingResults( $this->offset, $this->limit );
                        } else {
-                               $top = wfShowingResultsNum( $this->offset, $this->limit, $resultsShown );
+                               $top =  wfMsgExt( 'showingresultsnum', array( 'parseinline' ),
+                                       $wgLang->formatNum( $this->limit ),
+                                       $wgLang->formatNum( $this->offset + 1 ),
+                                       $wgLang->formatNum( $resultsShown )
+                               );
                        }
                        $out .= Xml::tags( 'div', array( 'class' => 'results-info' ),
                                Xml::tags( 'ul', null, Xml::tags( 'li', null, $top ) )