Merge branch 'mw-1.26'

2 files changed, 12 insertions, 1 deletions

diff --git a/includes/pager/ReverseChronologicalPager.php b/includes/pager/ReverseChronologicalPager.php
index 4f8c438d..ee6e26c0 100644
--- a/includes/pager/ReverseChronologicalPager.php
+++ b/includes/pager/ReverseChronologicalPager.php
@@ -113,6 +113,10 @@ abstract class ReverseChronologicalPager extends IndexPager {
 			$ymd = 20320101;
 		}
 
-		$this->mOffset = $this->mDb->timestamp( "${ymd}000000" );
+		// Treat the given time in the wiki timezone and get a UTC timestamp for the database lookup
+		$timestamp = MWTimestamp::getInstance( "${ymd}000000" );
+		$timestamp->setTimeZone( $this->getConfig()->get( 'Localtimezone' ) );
+
+		$this->mOffset = $this->mDb->timestamp( $timestamp->getTimestamp() );
 	}
 }
diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index 80955398..ea619f1a 100644
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -234,6 +234,13 @@ abstract class TablePager extends IndexPager {
 	}
 
 	/**
+	 * @return stdClass
+	 */
+	protected function getCurrentRow() {
+		return $this->mCurrentRow;
+	}
+
+	/**
 	 * Get any extra attributes to be applied to the given cell. Don't
 	 * take this as an excuse to hardcode styles; use classes and
 	 * CSS instead.  Row context is available in $this->mCurrentRow