From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 13 Jun 2018 20:07:02 +0000 (+0000)
Subject: Merge "Provide backwards compatibility for RevisionInsertComplete hook."
X-Git-Tag: 1.34.0-rc.0~5078
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=067b22566476639d404d1caaf9a460a4a0a398fe;hp=4b9b0e7fc59806a3e0b828e5a9bbbf37ebba4d6a;p=lhc%2Fweb%2Fwiklou.git

Merge "Provide backwards compatibility for RevisionInsertComplete hook."
---

diff --git a/includes/Revision.php b/includes/Revision.php
index 213abbef90..b9a03f5fc3 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1094,8 +1094,6 @@ class Revision implements IDBAccessObject {
 
 		// Avoid PHP 7.1 warning of passing $this by reference
 		$revision = $this;
-		// TODO: hard-deprecate in 1.32 (or even 1.31?)
-		Hooks::run( 'RevisionInsertComplete', [ &$revision, null, null ] );
 
 		return $rec->getId();
 	}
diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php
index 36af6cd8c2..ce09a6e768 100644
--- a/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@ -47,6 +47,7 @@ use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use RecentChange;
+use Revision;
 use stdClass;
 use Title;
 use User;
@@ -489,6 +490,10 @@ class RevisionStore
 
 		Hooks::run( 'RevisionRecordInserted', [ $rev ] );
 
+		// TODO: deprecate in 1.32!
+		$legacyRevision = new Revision( $rev );
+		Hooks::run( 'RevisionInsertComplete', [ &$legacyRevision, null, null ] );
+
 		return $rev;
 	}