Revert r55685, r55686 and r55687 for now. Limits not working.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index aa149b0..ead2b92 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -197,8 +197,6 @@ this. Was used when mwEmbed was going to be an extension.
 * (bug 20404) Custom fields in the user creation form template can now have
   detail labels in prefsectiontip divs.
 * MakeSysop and MakeBot are now aliases for Special:UserRights
-* IndexPager->mLimitsShown can now be an associative array of limit => text-to-
-  display-in-limit-form.
 
 === Bug fixes in 1.16 ===
 

diff --git a/includes/Pager.php b/includes/Pager.php
index 2aef1ba..054ca38 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -879,9 +879,9 @@ abstract class TablePager extends IndexPager {
        function getLimitSelect() {
                global $wgLang;
                $s = "<select name=\"limit\">";
-               foreach ( $this->mLimitsShown as $limit => $text ) {
+               foreach ( $this->mLimitsShown as $limit ) {
                        $selected = $limit == $this->mLimit ? 'selected="selected"' : '';
-                       $formattedLimit = $text ? $text : $wgLang->formatNum( $limit );
+                       $formattedLimit = $wgLang->formatNum( $limit );
                        $s .= "<option value=\"$limit\" $selected>$formattedLimit</option>\n";
                }
                $s .= "</select>";

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index 340eebc..f762532 100644 (file)
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -128,7 +128,6 @@ class AllmessagesTablePager extends TablePager {
 
        var $messages  = null;
        var $talkPages = null;
-       public $mLimitsShown;
 
        function __construct( $page, $conds, $langObj = null ) {
                parent::__construct();
@@ -136,10 +135,6 @@ class AllmessagesTablePager extends TablePager {
                $this->mPage = $page;
                $this->mConds = $conds;
                $this->mDefaultDirection = true; // always sort ascending
-               // We want to have an option for people to view *all* the messages, 
-               // so they can use Ctrl+F to search them.  5000 is the maximum that 
-               // will get through WebRequest::getLimitOffset().
-               $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 => wfMsg('messagesall') );
 
                global $wgLang, $wgContLang, $wgRequest;
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index bee1158..3e43790 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3814,7 +3814,6 @@ Others will be hidden by default.
 'watchlistall2'    => 'all',
 'namespacesall'    => 'all',
 'monthsall'        => 'all',
-'messagesall'      => 'all',
 
 # E-mail address confirmation
 'confirmemail'             => 'Confirm e-mail address',

diff --git a/languages/messages/MessagesLzh.php b/languages/messages/MessagesLzh.php
index a66f695..4f6472b 100644 (file)
--- a/languages/messages/MessagesLzh.php
+++ b/languages/messages/MessagesLzh.php
@@ -2433,7 +2433,6 @@ $1',
 'watchlistall2'    => '全',
 'namespacesall'    => '全',
 'monthsall'        => '全',
-'messagesall'      => '全',
 
 # E-mail address confirmation
 'confirmemail'             => '核郵驛',

diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index 9c36e3a..d9b041c 100644 (file)
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -2956,7 +2956,6 @@ Variants for Chinese language
 'watchlistall2'    => '全部',
 'namespacesall'    => '全部',
 'monthsall'        => '全部',
-'messagesall'      => '全部',
 
 # E-mail address confirmation
 'confirmemail'             => '確認電郵地址',

diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index adcd474..71eeafd 100644 (file)
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -2993,7 +2993,6 @@ Variants for Chinese language
 'watchlistall2'    => '全部',
 'namespacesall'    => '全部',
 'monthsall'        => '全部',
-'messagesall'      => '全部',
 
 # E-mail address confirmation
 'confirmemail'             => '确认邮箱地址',

diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index f93f2ff..c03eec6 100644 (file)
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -2981,7 +2981,6 @@ Variants for Chinese language
 'watchlistall2'    => '全部',
 'namespacesall'    => '全部',
 'monthsall'        => '全部',
-'messagesall'      => '全部',
 
 # E-mail address confirmation
 'confirmemail'             => '確認郵箱位址',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 51c050a..f8b901b 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2822,7 +2822,6 @@ $wgMessageStructure = array(
                'watchlistall2',
                'namespacesall',
                'monthsall',
-               'messagesall',
        ),
        'confirmemail' => array(
                'confirmemail',