From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 2 Feb 2011 20:25:47 +0000 (+0000)
Subject: Merge r80947 from 1.16wmf4 to trunk: throw exception when text couldn't be loaded... 
X-Git-Tag: 1.31.0-rc.0~32246
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=1734fe33cec41df34f04e8032444227122ab2882;p=lhc%2Fweb%2Fwiklou.git

Merge r80947 from 1.16wmf4 to trunk: throw exception when text couldn't be loaded from archive table
---

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 );
 	}