From b587c7d4e5cab1775528038e78553ef4e52feeab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C4=9Bj=20Such=C3=A1nek?= Date: Tue, 27 Aug 2019 09:56:38 +0200 Subject: [PATCH] Restore some previous constructor calls Follow-up to If07f10075a51fbbe9de24464cb6844faaad94780 and I082152b64141f1a9a4085bba23fe81a99ec8d886. It will make getRequest use the provided context again. Change-Id: I60b2598edcb0daed076876482e1e9d6cbf815eb2 --- includes/pager/TablePager.php | 6 +++++- includes/specials/pagers/ImageListPager.php | 4 +++- includes/specials/pagers/UsersPager.php | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php index 36ed9aa66a..f611699b94 100644 --- a/includes/pager/TablePager.php +++ b/includes/pager/TablePager.php @@ -35,6 +35,10 @@ abstract class TablePager extends IndexPager { protected $mCurrentRow; public function __construct( IContextSource $context = null, LinkRenderer $linkRenderer = null ) { + if ( $context ) { + $this->setContext( $context ); + } + $this->mSort = $this->getRequest()->getText( 'sort' ); if ( !array_key_exists( $this->mSort, $this->getFieldNames() ) || !$this->isFieldSortable( $this->mSort ) @@ -48,7 +52,7 @@ abstract class TablePager extends IndexPager { } /* Else leave it at whatever the class default is */ // Parent constructor needs mSort set, so we call it last - parent::__construct( $context, $linkRenderer ); + parent::__construct( null, $linkRenderer ); } /** diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php index 6bdccd8166..81b7808829 100644 --- a/includes/specials/pagers/ImageListPager.php +++ b/includes/specials/pagers/ImageListPager.php @@ -53,7 +53,7 @@ class ImageListPager extends TablePager { public function __construct( IContextSource $context, $userName = null, $search = '', $including = false, $showAll = false ) { - parent::__construct( $context ); + $this->setContext( $context ); $this->mIncluding = $including; $this->mShowAll = $showAll; @@ -95,6 +95,8 @@ class ImageListPager extends TablePager { } else { $this->mDefaultDirection = IndexPager::DIR_DESCENDING; } + + parent::__construct(); } /** diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index e27fb58655..57b575b8ec 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -44,6 +44,10 @@ class UsersPager extends AlphabeticPager { * another page */ public function __construct( IContextSource $context = null, $par = null, $including = null ) { + if ( $context ) { + $this->setContext( $context ); + } + $request = $this->getRequest(); $par = $par ?? ''; $parms = explode( '/', $par ); @@ -83,7 +87,7 @@ class UsersPager extends AlphabeticPager { } } - parent::__construct( $context ); + parent::__construct(); } /** -- 2.20.1