Merge "import: Remove deprecated WikiRevision::$importer property"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index ac06d63..cacfa51 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -246,6 +246,7 @@ because of Phabricator reports.
   Use require( 'mediawiki.libs.jpegmeta' ) instead.
 * The mw.user.stickyRandomId() method, deprecated in 1.32, was removed.
   Use mw.user.getPageviewToken() instead.
+* Removed deprecated class property WikiRevision::$importer.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 55a7b2d..96b43d6 100644 (file)
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -36,13 +36,6 @@ use MediaWiki\MediaWikiServices;
  */
 class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 
-       /**
-        * @since 1.17
-        * @deprecated in 1.29. Unused.
-        * @note Introduced in 9b3128eb2b654761f21fd4ca1d5a1a4b796dc912, unused there, unused now.
-        */
-       public $importer = null;
-
        /**
         * @since 1.2
         * @var Title