Index: branches/REL1_10/phase3/includes/Pager.php |
— | — | @@ -72,17 +72,18 @@ |
73 | 73 | public $mResult; |
74 | 74 | |
75 | 75 | function __construct() { |
76 | | - global $wgRequest; |
| 76 | + global $wgRequest, $wgUser; |
77 | 77 | $this->mRequest = $wgRequest; |
78 | | - |
| 78 | + |
79 | 79 | # NB: the offset is quoted, not validated. It is treated as an arbitrary string |
80 | 80 | # to support the widest variety of index types. Be careful outputting it into |
81 | 81 | # HTML! |
82 | 82 | $this->mOffset = $this->mRequest->getText( 'offset' ); |
83 | | - $this->mLimit = $this->mRequest->getInt( 'limit', $this->mDefaultLimit ); |
84 | | - if ( $this->mLimit <= 0 || $this->mLimit > 50000 ) { |
85 | | - $this->mLimit = $this->mDefaultLimit; |
86 | | - } |
| 83 | + |
| 84 | + # Use consistent behavior for the limit options |
| 85 | + $this->mDefaultLimit = intval( $wgUser->getOption( 'rclimit' ) ); |
| 86 | + list( $this->mLimit, /* $offset */ ) = $this->mRequest->getLimitOffset(); |
| 87 | + |
87 | 88 | $this->mIsBackwards = ( $this->mRequest->getVal( 'dir' ) == 'prev' ); |
88 | 89 | $this->mIndexField = $this->getIndexField(); |
89 | 90 | $this->mDb = wfGetDB( DB_SLAVE ); |
Index: branches/REL1_10/phase3/RELEASE-NOTES |
— | — | @@ -3,6 +3,12 @@ |
4 | 4 | Security reminder: MediaWiki does not require PHP's register_globals |
5 | 5 | setting since version 1.2.0. If you have it on, turn it *off* if you can. |
6 | 6 | |
| 7 | +== MediaWiki 1.10 == |
| 8 | + |
| 9 | +Changes since 1.10.0rc2: |
| 10 | + |
| 11 | +* (bug 9808) Fix regression that ignored user 'rclimit' option for Special:Contributions |
| 12 | + |
7 | 13 | == MediaWiki 1.10.0rc2 == |
8 | 14 | |
9 | 15 | May 4, 2007 |
— | — | @@ -10,7 +16,7 @@ |
11 | 17 | THIS IS A RELEASE CANDIDATE MADE AVAILABLE FOR TESTING! |
12 | 18 | A FINAL 1.10.0 RELEASE WILL APPEAR WITHIN A FEW DAYS. |
13 | 19 | |
14 | | -Changes since 1.10.0RC1: |
| 20 | +Changes since 1.10.0rc1: |
15 | 21 | * Various l10n fixes and updates |
16 | 22 | * Fix for upgrade of page_restrictions table |
17 | 23 | * (bug 9780) Fix normalization of titles with initial colon followed by whitespace |
— | — | @@ -18,7 +24,7 @@ |
19 | 25 | * Avoid cyclic stub problems when authorization hooks do funny things with |
20 | 26 | the user and the database at load time |
21 | 27 | |
22 | | -== MediaWiki 1.10.0RC1 == |
| 28 | +== MediaWiki 1.10.0rc1 == |
23 | 29 | |
24 | 30 | April 30, 2007 |
25 | 31 | |