From 31b43de01238d914a843c1fde146166debb82cbd Mon Sep 17 00:00:00 2001
From: Owen Davis <owen@users.mediawiki.org>
Date: Wed, 20 Jul 2011 00:15:05 +0000
Subject: [PATCH] added missing null checks in callers of
 Revision::newNullRevision

---
 includes/filerepo/LocalFile.php     |  9 +++++----
 includes/specials/SpecialImport.php | 12 +++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 9f51c34325..e940fd4575 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -991,11 +991,12 @@ class LocalFile extends File {
 				$log->getRcComment(),
 				false
 			);
-			$nullRevision->insertOn( $dbw );
-
-			wfRunHooks( 'NewRevisionFromEditComplete', array( $article, $nullRevision, $latest, $user ) );
-			$article->updateRevisionOn( $dbw, $nullRevision );
+			if (!is_null($nullRevision)) {
+				$nullRevision->insertOn( $dbw );
 
+				wfRunHooks( 'NewRevisionFromEditComplete', array( $article, $nullRevision, $latest, $user ) );
+				$article->updateRevisionOn( $dbw, $nullRevision );
+			}
 			# Invalidate the cache for the description page
 			$descTitle->invalidateCache();
 			$descTitle->purgeSquid();
diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index fc904a23e6..d964b9361a 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -384,11 +384,13 @@ class ImportReporter {
 			$dbw = wfGetDB( DB_MASTER );
 			$latest = $title->getLatestRevID();
 			$nullRevision = Revision::newNullRevision( $dbw, $title->getArticleId(), $comment, true );
-			$nullRevision->insertOn( $dbw );
-			$article = new Article( $title );
-			# Update page record
-			$article->updateRevisionOn( $dbw, $nullRevision );
-			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
+			if (!is_null($nullRevision)) {
+				$nullRevision->insertOn( $dbw );
+				$article = new Article( $title );
+				# Update page record
+				$article->updateRevisionOn( $dbw, $nullRevision );
+				wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
+			}
 		} else {
 			$wgOut->addHTML( "<li>" . Linker::linkKnown( $title ) . " " .
 				wfMsgHtml( 'import-nonewrevisions' ) . "</li>\n" );
-- 
2.20.1