Merge "pager: Provide a method to override the timestamp field"

2 files changed, 19 insertions, 9 deletions

diff --git a/includes/pager/RangeChronologicalPager.php b/includes/pager/RangeChronologicalPager.php
index 3d7c4134d7d6..3d08e59493d6 100644
--- a/includes/pager/RangeChronologicalPager.php
+++ b/includes/pager/RangeChronologicalPager.php
@@ -53,13 +53,12 @@ abstract class RangeChronologicalPager extends ReverseChronologicalPager {
 		// Construct the conds array for compatibility with callers and derived classes
 		$this->rangeConds = [];
 
-		// This is a chronological pager, so the first column should be some kind of timestamp
-		$timestampField = is_array( $this->mIndexField ) ? $this->mIndexField[0] : $this->mIndexField;
 		try {
 			if ( $startTime !== '' ) {
 				$startTimestamp = MWTimestamp::getInstance( $startTime );
 				$this->startOffset = $this->mDb->timestamp( $startTimestamp->getTimestamp() );
-				$this->rangeConds[] = $this->mDb->buildComparison( '>=', [ $timestampField => $this->startOffset ] );
+				$this->rangeConds[] = $this->mDb->buildComparison( '>=',
+					[ $this->getTimestampField() => $this->startOffset ] );
 			}
 
 			if ( $endTime !== '' ) {
@@ -68,7 +67,8 @@ abstract class RangeChronologicalPager extends ReverseChronologicalPager {
 				// add one second for compatibility with existing use cases
 				$endTimestamp->timestamp = $endTimestamp->timestamp->modify( '+1 second' );
 				$this->endOffset = $this->mDb->timestamp( $endTimestamp->getTimestamp() );
-				$this->rangeConds[] = $this->mDb->buildComparison( '<', [ $timestampField => $this->endOffset ] );
+				$this->rangeConds[] = $this->mDb->buildComparison( '<',
+					[ $this->getTimestampField() => $this->endOffset ] );
 
 				// populate existing variables for compatibility with parent
 				$this->mYear = (int)$endTimestamp->format( 'Y' );
@@ -104,8 +104,7 @@ abstract class RangeChronologicalPager extends ReverseChronologicalPager {
 		);
 		// End of the range has been added by ReverseChronologicalPager
 		if ( $this->startOffset ) {
-			$timestampField = is_array( $this->mIndexField ) ? $this->mIndexField[0] : $this->mIndexField;
-			$conds[] = $this->mDb->buildComparison( '>=', [ $timestampField => $this->startOffset ] );
+			$conds[] = $this->mDb->buildComparison( '>=', [ $this->getTimestampField() => $this->startOffset ] );
 		} elseif ( $this->rangeConds ) {
 			// Keep compatibility with some derived classes, T325034
 			$conds = array_merge( $conds, $this->rangeConds );
diff --git a/includes/pager/ReverseChronologicalPager.php b/includes/pager/ReverseChronologicalPager.php
index d9966ec5770a..cdd0bbf3777d 100644
--- a/includes/pager/ReverseChronologicalPager.php
+++ b/includes/pager/ReverseChronologicalPager.php
@@ -89,6 +89,18 @@ abstract class ReverseChronologicalPager extends IndexPager {
 	}
 
 	/**
+	 * Returns the name of the timestamp field. Subclass can override this to provide the
+	 * timestamp field if they are using a aliased field for getIndexField()
+	 *
+	 * @since 1.40
+	 * @return string
+	 */
+	public function getTimestampField() {
+		// This is a chronological pager, so the first column should be some kind of timestamp
+		return is_array( $this->mIndexField ) ? $this->mIndexField[0] : $this->mIndexField;
+	}
+
+	/**
 	 * Get date from the timestamp
 	 *
 	 * @since 1.38
@@ -105,7 +117,7 @@ abstract class ReverseChronologicalPager extends IndexPager {
 	protected function getRow( $row ): string {
 		$s = '';
 
-		$timestampField = is_array( $this->mIndexField ) ? $this->mIndexField[0] : $this->mIndexField;
+		$timestampField = $this->getTimestampField();
 		$timestamp = $row->$timestampField ?? null;
 		$date = $timestamp ? $this->getDateFromTimestamp( $timestamp ) : null;
 		if ( $date && $this->isHeaderRowNeeded( $date ) ) {
@@ -310,8 +322,7 @@ abstract class ReverseChronologicalPager extends IndexPager {
 			$order
 		);
 		if ( $this->endOffset ) {
-			$timestampField = is_array( $this->mIndexField ) ? $this->mIndexField[0] : $this->mIndexField;
-			$conds[] = $this->mDb->buildComparison( '<', [ $timestampField => $this->endOffset ] );
+			$conds[] = $this->mDb->buildComparison( '<', [ $this->getTimestampField() => $this->endOffset ] );
 		}
 
 		return [ $tables, $fields, $conds, $fname, $options, $join_conds ];