Merge "resourceloader: Compile documentElement.className server-side"

[lhc/web/wiklou.git] / includes / pager / TablePager.php

diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index 7f54617..f611699 100644 (file)
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -35,7 +35,9 @@ abstract class TablePager extends IndexPager {
        protected $mCurrentRow;
 
        public function __construct( IContextSource $context = null, LinkRenderer $linkRenderer = null ) {
-               parent::__construct( $context, $linkRenderer );
+               if ( $context ) {
+                       $this->setContext( $context );
+               }
 
                $this->mSort = $this->getRequest()->getText( 'sort' );
                if ( !array_key_exists( $this->mSort, $this->getFieldNames() )
@@ -48,6 +50,9 @@ abstract class TablePager extends IndexPager {
                } elseif ( $this->getRequest()->getBool( 'desc' ) ) {
                        $this->mDefaultDirection = IndexPager::DIR_DESCENDING;
                } /* Else leave it at whatever the class default is */
+
+               // Parent constructor needs mSort set, so we call it last
+               parent::__construct( null, $linkRenderer );
        }
 
        /**