Merge "Deprecate $wgFixArabicUnicode / $wgFixMalayalamUnicode"

[lhc/web/wiklou.git] / includes / page / PageArchive.php

diff --git a/includes/page/PageArchive.php b/includes/page/PageArchive.php
index fc079e2..e843cf3 100644 (file)
--- a/includes/page/PageArchive.php
+++ b/includes/page/PageArchive.php
@@ -19,8 +19,8 @@
  */
 
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Storage\RevisionRecord;
-use MediaWiki\Storage\RevisionStore;
+use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Storage\SqlBlobStore;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IResultWrapper;
@@ -329,7 +329,7 @@ class PageArchive {
 
                // Check the previous deleted revision...
                $row = $dbr->selectRow( 'archive',
-                       [ 'ar_id', 'ar_timestamp' ],
+                       [ 'ar_rev_id', 'ar_timestamp' ],
                        [ 'ar_namespace' => $this->title->getNamespace(),
                                'ar_title' => $this->title->getDBkey(),
                                'ar_timestamp < ' .
@@ -767,7 +767,7 @@ class PageArchive {
                                        0,
                                        $this->title,
                                        [
-                                               'page' => $pageId,
+                                               'page_id' => $pageId,
                                                'deleted' => $unsuppress ? 0 : $row->ar_deleted
                                        ]
                                );