Merge "Work around annoying Revision::newFromArchiveRow exception."

diff --combined maintenance/populateRevisionSha1.php
index a90b540,2266a3f..d8ff749
--- 1/maintenance/populateRevisionSha1.php
--- 2/maintenance/populateRevisionSha1.php
+++ b/maintenance/populateRevisionSha1.php
@@@ -102,8 -102,7 +102,8 @@@ class PopulateRevisionSha1 extends Logg
        protected function doSha1LegacyUpdates() {
                $count = 0;
                $db = $this->getDB( DB_MASTER );
 -              $res = $db->select( 'archive', '*', array( 'ar_rev_id IS NULL' ), __METHOD__ );
 +              $res = $db->select( 'archive', '*',
 +                      array( 'ar_rev_id IS NULL', 'ar_sha1' => '' ), __METHOD__ );
  
                $updateSize = 0;
                $db->begin( __METHOD__ );
@@@ -158,7 -157,11 +158,11 @@@
         */
        protected function upgradeLegacyArchiveRow( $row ) {
                $db = $this->getDB( DB_MASTER );
-               $rev = Revision::newFromArchiveRow( $row );
+               try {
+                       $rev = Revision::newFromArchiveRow( $row );
+               } catch ( MWException $e ) {
+                       return false; // bug 22624?
+               }
                $text = $rev->getRawText();
                if ( !is_string( $text ) ) {
                        # This should not happen, but sometimes does (bug 20757)