From 88ee6e03e6ba84f4b0ee9cb3e9cd8ccacc7199b7 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Tue, 5 Nov 2013 20:37:45 +0100 Subject: [PATCH] Avoid fatal in ContentHandler::getUndoContent by null content Revision::getContent can return null, which would here result in a fatal error. Return false to indicate that this undo is not possible. Change-Id: I6f6b4b59e86f9762f61c50dd65f81a7256c5255a --- includes/content/ContentHandler.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index 2a92e23389..8991290e7d 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -907,6 +907,10 @@ abstract class ContentHandler { $undo_content = $undo->getContent(); $undoafter_content = $undoafter->getContent(); + if ( !$undo_content || !$undoafter_content ) { + return false; // no content to undo + } + $this->checkModelID( $cur_content->getModel() ); $this->checkModelID( $undo_content->getModel() ); $this->checkModelID( $undoafter_content->getModel() ); -- 2.20.1