| Index: trunk/phase3/includes/Revision.php |
| — | — | @@ -82,6 +82,9 @@ |
| 83 | 83 | if ( isset( $row->ar_text ) && !$row->ar_text_id ) { |
| 84 | 84 | // Pre-1.5 ar_text row |
| 85 | 85 | $attribs['text'] = self::getRevisionText( $row, 'ar_' ); |
| | 86 | + if ( $attribs['text'] === false ) { |
| | 87 | + throw new MWException( 'Unable to load text from archive row (possibly bug 22624)' ); |
| | 88 | + } |
| 86 | 89 | } |
| 87 | 90 | return new self( $attribs ); |
| 88 | 91 | } |
| Property changes on: trunk/phase3/includes/Revision.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 89 | 92 | Merged /branches/sqlite/includes/Revision.php:r58211-58321 |
| 90 | 93 | Merged /branches/new-installer/phase3/includes/Revision.php:r43664-66004 |
| 91 | 94 | Merged /branches/wmf-deployment/includes/Revision.php:r53381 |
| 92 | 95 | Merged /branches/REL1_15/phase3/includes/Revision.php:r51646 |
| 93 | 96 | Merged /branches/wmf/1.16wmf4/includes/Revision.php:r80947 |