added missing null checks in callers of Revision::newNullRevision

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 9f51c34..e940fd4 100644 (file)
--- 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 fc904a2..d964b93 100644 (file)
--- 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" );