From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Thu, 17 Jun 2010 07:32:39 +0000 (+0000)
Subject: Add the current limit (manually changed by a user) from the query string to avoid... 
X-Git-Tag: 1.31.0-rc.0~36487
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=ad375dddafd44be2ce8657b1b1f5370a597e52ab;p=lhc%2Fweb%2Fwiklou.git

Add the current limit (manually changed by a user) from the query string to avoid that the limit is lost after clicking Go next time
---

diff --git a/includes/Pager.php b/includes/Pager.php
index a381fd7f7b..a90867c59d 100644
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -986,7 +986,14 @@ abstract class TablePager extends IndexPager {
 	 */
 	function getLimitSelect() {
 		global $wgLang;
-		$s = "<select name=\"limit\">";
+		
+		# Add the current limit from the query string
+		# to avoid that the limit is lost after clicking Go next time
+		if ( !in_array( $this->mLimit, $this->mLimitsShown ) ) {
+			$this->mLimitsShown[] = $this->mLimit;
+			sort( $this->mLimitsShown );
+		}
+		$s = Html::openElement( 'select', array( 'name' => 'limit' ) ) . "\n";
 		foreach ( $this->mLimitsShown as $key => $value ) {
 			# The pair is either $index => $limit, in which case the $value
 			# will be numeric, or $limit => $text, in which case the $value
@@ -998,10 +1005,9 @@ abstract class TablePager extends IndexPager {
 				$limit = $key;
 				$text = $value;
 			}
-			$selected = ( $limit == $this->mLimit ? 'selected="selected"' : '' );
-			$s .= "<option value=\"$limit\" $selected>$text</option>\n";
+			$s .= Xml::option( $text, $limit, $limit == $this->mLimit ) . "\n";
 		}
-		$s .= "</select>";
+		$s .= Html::closeElement( 'select' );
 		return $s;
 	}