Merge "Title: Title::getSubpage should not lose the interwiki prefix"

[lhc/web/wiklou.git] / includes / specials / SpecialUndelete.php

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 456face..31e4836 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -138,8 +138,10 @@ class SpecialUndelete extends SpecialPage {
         */
        protected function isAllowed( $permission, User $user = null ) {
                $user = $user ?: $this->getUser();
+               $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+
                if ( $this->mTargetObj !== null ) {
-                       return $this->mTargetObj->userCan( $permission, $user );
+                       return $permissionManager->userCan( $permission, $user, $this->mTargetObj );
                } else {
                        return $user->isAllowed( $permission );
                }
@@ -156,6 +158,7 @@ class SpecialUndelete extends SpecialPage {
 
                $this->setHeaders();
                $this->outputHeader();
+               $this->addHelpLink( 'Help:Deletion_and_undeletion' );
 
                $this->loadRequest( $par );
                $this->checkPermissions(); // Needs to be after mTargetObj is set
@@ -185,7 +188,7 @@ class SpecialUndelete extends SpecialPage {
                if ( $this->mTimestamp !== '' ) {
                        $this->showRevision( $this->mTimestamp );
                } elseif ( $this->mFilename !== null && $this->mTargetObj->inNamespace( NS_FILE ) ) {
-                       $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename );
+                       $file = new ArchivedFile( $this->mTargetObj, 0, $this->mFilename );
                        // Check if user is allowed to see this file
                        if ( !$file->exists() ) {
                                $out->addWikiMsg( 'filedelete-nofile', $this->mFilename );
@@ -649,7 +652,7 @@ class SpecialUndelete extends SpecialPage {
                $out = $this->getOutput();
                $lang = $this->getLanguage();
                $user = $this->getUser();
-               $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename );
+               $file = new ArchivedFile( $this->mTargetObj, 0, $this->mFilename );
                $out->addWikiMsg( 'undelete-show-file-confirm',
                        $this->mTargetObj->getText(),
                        $lang->userDate( $file->getTimestamp(), $user ),