Pass user to WikiPage::doDeleteArticleReal

This avoids use of $wgUser in WikiPage::doDeleteArticleReal

Change-Id: Iacbcd998a4470c583d839824baf8b8f8e37a0d4b

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index d8b5718..6279dfd 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -131,7 +131,7 @@ class ApiDelete extends ApiBase {
                $error = '';
 
                // Luckily, Article.php provides a reusable delete function that does the hard work for us
                $error = '';
 
                // Luckily, Article.php provides a reusable delete function that does the hard work for us

-               return $page->doDeleteArticleReal( $reason, false, 0, true, $error );
+               return $page->doDeleteArticleReal( $reason, false, 0, true, $error, $user );

        }
 
        /**
        }
 
        /**

diff --git a/includes/page/Article.php b/includes/page/Article.php
index a6b6b51..f213f6a 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1795,8 +1795,10 @@ class Article implements Page {
         */
        public function doDelete( $reason, $suppress = false ) {
                $error = '';
         */
        public function doDelete( $reason, $suppress = false ) {
                $error = '';

-               $outputPage = $this->getContext()->getOutput();
-               $status = $this->mPage->doDeleteArticleReal( $reason, $suppress, 0, true, $error );
+               $context = $this->getContext();
+               $outputPage = $context->getOutput();
+               $user = $context->getUser();
+               $status = $this->mPage->doDeleteArticleReal( $reason, $suppress, 0, true, $error, $user );

 
                if ( $status->isGood() ) {
                        $deleted = $this->getTitle()->getPrefixedText();
 
                if ( $status->isGood() ) {
                        $deleted = $this->getTitle()->getPrefixedText();