From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 29 Jul 2014 20:34:10 +0000 (+0000)
Subject: Merge "Clean up search results if scrolled of the end"
X-Git-Tag: 1.31.0-rc.0~14685
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=f495838adff633c198f8c8a7a4690da499bfa96c;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Clean up search results if scrolled of the end"
---

f495838adff633c198f8c8a7a4690da499bfa96c
diff --combined includes/specials/SpecialSearch.php
index 4532f98d68,248a15af10..423b875a8b
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -424,10 -424,8 +424,10 @@@ class SpecialSearch extends SpecialPag
  			return;
  		}
  
 +		$linkClass = 'mw-search-createlink';
  		if ( $title->isKnown() ) {
  			$messageName = 'searchmenu-exists';
 +			$linkClass = 'mw-search-exists';
  		} elseif ( $title->quickUserCan( 'create', $this->getUser() ) ) {
  			$messageName = 'searchmenu-new';
  		} else {
@@@ -442,7 -440,7 +442,7 @@@
  
  		// Extensions using the hook might still return an empty $messageName
  		if ( $messageName ) {
 -			$this->getOutput()->wrapWikiMsg( "<p class=\"mw-search-createlink\">\n$1</p>", $params );
 +			$this->getOutput()->wrapWikiMsg( "<p class=\"$linkClass\">\n$1</p>", $params );
  		} else {
  			// preserve the paragraph for margins etc...
  			$this->getOutput()->addHtml( '<p></p>' );
@@@ -1093,7 -1091,7 +1093,7 @@@
  		) . "\n";
  
  		// Results-info
- 		if ( $totalNum > 0 ) {
+ 		if ( $totalNum > 0 && $this->offset < $totalNum ) {
  			$top = $this->msg( 'showingresultsheader' )
  				->numParams( $this->offset + 1, $this->offset + $resultsShown, $totalNum )
  				->params( wfEscapeWikiText( $term ) )