From 1734fe33cec41df34f04e8032444227122ab2882 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 2 Feb 2011 20:25:47 +0000
Subject: [PATCH] Merge r80947 from 1.16wmf4 to trunk: throw exception when
 text couldn't be loaded from archive table

---
 includes/Revision.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/includes/Revision.php b/includes/Revision.php
index 8096603a7a..9cc49350bb 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -82,6 +82,9 @@ class Revision {
 		if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
 			// Pre-1.5 ar_text row
 			$attribs['text'] = self::getRevisionText( $row, 'ar_' );
+			if ( $attribs['text'] === false ) {
+				throw new MWException( 'Unable to load text from archive row (possibly bug 22624)' );
+			}
 		}
 		return new self( $attribs );
 	}
-- 
2.20.1