Merge "Show the revision ID on error message when content is missing on difference...

diff --combined includes/diff/DifferenceEngine.php
index e73754d,97b5b70..0c9086b
--- 1/includes/diff/DifferenceEngine.php
--- 2/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@@ -185,10 -185,14 +185,14 @@@ class DifferenceEngine extends ContextS
                $out = $this->getOutput();
  
                $missing = array();
-               if ( $this->mOldRev === null ) {
+               if ( $this->mOldRev === null ||
+                       ( $this->mOldRev && $this->mOldContent === null )
+               ) {
                        $missing[] = $this->deletedIdMarker( $this->mOldid );
                }
-               if ( $this->mNewRev === null ) {
+               if ( $this->mNewRev === null ||
+                       ( $this->mNewRev && $this->mNewContent === null )
+               ) {
                        $missing[] = $this->deletedIdMarker( $this->mNewid );
                }
  
@@@ -1181,29 -1185,26 +1185,29 @@@
        function loadText() {
                if ( $this->mTextLoaded == 2 ) {
                        return true;
 -              } else {
 -                      // Whether it succeeds or fails, we don't want to try again
 -                      $this->mTextLoaded = 2;
                }
  
 +              // Whether it succeeds or fails, we don't want to try again
 +              $this->mTextLoaded = 2;
 +
                if ( !$this->loadRevisionData() ) {
                        return false;
                }
 +
                if ( $this->mOldRev ) {
                        $this->mOldContent = $this->mOldRev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
                        if ( $this->mOldContent === null ) {
                                return false;
                        }
                }
 +
                if ( $this->mNewRev ) {
                        $this->mNewContent = $this->mNewRev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
                        if ( $this->mNewContent === null ) {
                                return false;
                        }
                }
 +
                return true;
        }
  
@@@ -1215,16 -1216,13 +1219,16 @@@
        function loadNewText() {
                if ( $this->mTextLoaded >= 1 ) {
                        return true;
 -              } else {
 -                      $this->mTextLoaded = 1;
                }
 +
 +              $this->mTextLoaded = 1;
 +
                if ( !$this->loadRevisionData() ) {
                        return false;
                }
 +
                $this->mNewContent = $this->mNewRev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
 +
                return true;
        }
  }