From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 14 Feb 2018 18:30:48 +0000 (+0000)
Subject: Merge "Log the reason why revision->getContent() returns null"
X-Git-Tag: 1.31.0-rc.0~611
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=803f3867b7fcbb5fcee405f5c10cfa06cb857bd6;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Log the reason why revision->getContent() returns null"
---

803f3867b7fcbb5fcee405f5c10cfa06cb857bd6
diff --combined includes/Revision.php
index eba563cfda,ffcb8b49b6..d9d3149463
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@@ -22,8 -22,6 +22,8 @@@
  
  use MediaWiki\Storage\MutableRevisionRecord;
  use MediaWiki\Storage\RevisionAccessException;
 +use MediaWiki\Storage\RevisionFactory;
 +use MediaWiki\Storage\RevisionLookup;
  use MediaWiki\Storage\RevisionRecord;
  use MediaWiki\Storage\RevisionStore;
  use MediaWiki\Storage\RevisionStoreRecord;
@@@ -66,20 -64,6 +66,20 @@@ class Revision implements IDBAccessObje
  		return MediaWikiServices::getInstance()->getRevisionStore();
  	}
  
 +	/**
 +	 * @return RevisionLookup
 +	 */
 +	protected static function getRevisionLookup() {
 +		return MediaWikiServices::getInstance()->getRevisionLookup();
 +	}
 +
 +	/**
 +	 * @return RevisionFactory
 +	 */
 +	protected static function getRevisionFactory() {
 +		return MediaWikiServices::getInstance()->getRevisionFactory();
 +	}
 +
  	/**
  	 * @param bool|string $wiki The ID of the target wiki database. Use false for the local wiki.
  	 *
@@@ -113,7 -97,7 +113,7 @@@
  	 * @return Revision|null
  	 */
  	public static function newFromId( $id, $flags = 0 ) {
 -		$rec = self::getRevisionStore()->getRevisionById( $id, $flags );
 +		$rec = self::getRevisionLookup()->getRevisionById( $id, $flags );
  		return $rec === null ? null : new Revision( $rec, $flags );
  	}
  
@@@ -132,7 -116,7 +132,7 @@@
  	 * @return Revision|null
  	 */
  	public static function newFromTitle( LinkTarget $linkTarget, $id = 0, $flags = 0 ) {
 -		$rec = self::getRevisionStore()->getRevisionByTitle( $linkTarget, $id, $flags );
 +		$rec = self::getRevisionLookup()->getRevisionByTitle( $linkTarget, $id, $flags );
  		return $rec === null ? null : new Revision( $rec, $flags );
  	}
  
@@@ -151,7 -135,7 +151,7 @@@
  	 * @return Revision|null
  	 */
  	public static function newFromPageId( $pageId, $revId = 0, $flags = 0 ) {
 -		$rec = self::getRevisionStore()->getRevisionByPageId( $pageId, $revId, $flags );
 +		$rec = self::getRevisionLookup()->getRevisionByPageId( $pageId, $revId, $flags );
  		return $rec === null ? null : new Revision( $rec, $flags );
  	}
  
@@@ -200,7 -184,7 +200,7 @@@
  			}
  		}
  
 -		$rec = self::getRevisionStore()->newRevisionFromArchiveRow( $row, 0, $title, $overrides );
 +		$rec = self::getRevisionFactory()->newRevisionFromArchiveRow( $row, 0, $title, $overrides );
  		return new Revision( $rec, self::READ_NORMAL, $title );
  	}
  
@@@ -218,9 -202,9 +218,9 @@@
  	 */
  	public static function newFromRow( $row ) {
  		if ( is_array( $row ) ) {
 -			$rec = self::getRevisionStore()->newMutableRevisionFromArray( $row );
 +			$rec = self::getRevisionFactory()->newMutableRevisionFromArray( $row );
  		} else {
 -			$rec = self::getRevisionStore()->newRevisionFromRow( $row );
 +			$rec = self::getRevisionFactory()->newRevisionFromRow( $row );
  		}
  
  		return new Revision( $rec );
@@@ -357,7 -341,7 +357,7 @@@
  			'rev_sha1',
  		];
  
 -		$fields += CommentStore::newKey( 'rev_comment' )->getFields();
 +		$fields += CommentStore::getStore()->getFields( 'rev_comment' );
  
  		if ( $wgContentHandlerUseDB ) {
  			$fields[] = 'rev_content_format';
@@@ -394,7 -378,7 +394,7 @@@
  			'ar_sha1',
  		];
  
 -		$fields += CommentStore::newKey( 'ar_comment' )->getFields();
 +		$fields += CommentStore::getStore()->getFields( 'ar_comment' );
  
  		if ( $wgContentHandlerUseDB ) {
  			$fields[] = 'ar_content_format';
@@@ -508,13 -492,13 +508,13 @@@
  				$row['user'] = $wgUser;
  			}
  
 -			$this->mRecord = self::getRevisionStore()->newMutableRevisionFromArray(
 +			$this->mRecord = self::getRevisionFactory()->newMutableRevisionFromArray(
  				$row,
  				$queryFlags,
  				$this->ensureTitle( $row, $queryFlags, $title )
  			);
  		} elseif ( is_object( $row ) ) {
 -			$this->mRecord = self::getRevisionStore()->newRevisionFromRow(
 +			$this->mRecord = self::getRevisionFactory()->newRevisionFromRow(
  				$row,
  				$queryFlags,
  				$this->ensureTitle( $row, $queryFlags, $title )
@@@ -906,6 -890,11 +906,11 @@@
  			return $this->mRecord->getContent( 'main', $audience, $user );
  		}
  		catch ( RevisionAccessException $e ) {
+ 			wfDebugLog(
+ 				'T184670',
+ 				__METHOD__ . ": Cannot get content: " . $e->getMessage() .
+ 				"\n" . $e->getTraceAsString()
+ 			);
  			return null;
  		}
  	}
@@@ -992,7 -981,7 +997,7 @@@
  	 */
  	public function getPrevious() {
  		$title = $this->getTitle();
 -		$rec = self::getRevisionStore()->getPreviousRevision( $this->mRecord, $title );
 +		$rec = self::getRevisionLookup()->getPreviousRevision( $this->mRecord, $title );
  		return $rec === null ? null : new Revision( $rec, self::READ_NORMAL, $title );
  	}
  
@@@ -1003,7 -992,7 +1008,7 @@@
  	 */
  	public function getNext() {
  		$title = $this->getTitle();
 -		$rec = self::getRevisionStore()->getNextRevision( $this->mRecord, $title );
 +		$rec = self::getRevisionLookup()->getNextRevision( $this->mRecord, $title );
  		return $rec === null ? null : new Revision( $rec, self::READ_NORMAL, $title );
  	}
  
@@@ -1263,7 -1252,7 +1268,7 @@@
  			return false;
  		}
  
 -		$record = self::getRevisionStore()->getKnownCurrentRevision( $title, $revId );
 +		$record = self::getRevisionLookup()->getKnownCurrentRevision( $title, $revId );
  		return $record ? new Revision( $record ) : false;
  	}
  }