Merge "Handle failure to load content in Revision getSize, etc"

diff --combined includes/Revision.php
index b653f7f,6db3710..66b4173
--- 1/includes/Revision.php
--- 2/includes/Revision.php
+++ b/includes/Revision.php
@@@ -608,20 -608,27 +608,27 @@@ class Revision implements IDBAccessObje
        /**
         * Returns the length of the text in this revision, or null if unknown.
         *
-        * @return int
+        * @return int|null
         */
        public function getSize() {
-               return $this->mRecord->getSize();
+               try {
+                       return $this->mRecord->getSize();
+               } catch ( RevisionAccessException $ex ) {
+                       return null;
+               }
        }
  
        /**
         * Returns the base36 sha1 of the content in this revision, or null if unknown.
         *
-        * @return string
+        * @return string|null
         */
        public function getSha1() {
-               // XXX: we may want to drop all the hashing logic, it's not worth the overhead.
-               return $this->mRecord->getSha1();
+               try {
+                       return $this->mRecord->getSha1();
+               } catch ( RevisionAccessException $ex ) {
+                       return null;
+               }
        }
  
        /**
@@@ -1065,11 -1072,7 +1072,11 @@@
  
                $comment = CommentStoreComment::newUnsavedComment( $summary, null );
  
 -              $title = Title::newFromID( $pageId );
 +              $title = Title::newFromID( $pageId, Title::GAID_FOR_UPDATE );
 +              if ( $title === null ) {
 +                      return null;
 +              }
 +
                $rec = self::getRevisionStore()->newNullRevision( $dbw, $title, $comment, $minor, $user );
  
                return new Revision( $rec );