From bae3947a0f68067a38d9dbe05cb14fa39c966c5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 31 Aug 2009 06:54:52 +0000 Subject: [PATCH] Revert r55685, r55686 and r55687 for now. Limits not working. --- RELEASE-NOTES | 2 -- includes/Pager.php | 4 ++-- includes/specials/SpecialAllmessages.php | 5 ----- languages/messages/MessagesEn.php | 1 - languages/messages/MessagesLzh.php | 1 - languages/messages/MessagesYue.php | 1 - languages/messages/MessagesZh_hans.php | 1 - languages/messages/MessagesZh_hant.php | 1 - maintenance/language/messages.inc | 1 - 9 files changed, 2 insertions(+), 15 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index aa149b0273..ead2b92615 100644 --- 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 2aef1baaaa..054ca38286 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -879,9 +879,9 @@ abstract class TablePager extends IndexPager { function getLimitSelect() { global $wgLang; $s = ""; diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index 340eebc295..f762532b35 100644 --- 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 bee1158f33..3e43790785 100644 --- 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 a66f695b13..4f6472b44a 100644 --- 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 9c36e3a6d0..d9b041c330 100644 --- 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 adcd47407d..71eeafd6b8 100644 --- 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 f93f2ffb40..c03eec6101 100644 --- 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 51c050a6ee..f8b901bb7a 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2822,7 +2822,6 @@ $wgMessageStructure = array( 'watchlistall2', 'namespacesall', 'monthsall', - 'messagesall', ), 'confirmemail' => array( 'confirmemail', -- 2.20.1