X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUndelete.php;h=456facef1216e7cd3d364f747445b5d775597991;hb=9189db0c50cd4f755efc1d0ce061f6c04b236a40;hp=9654bb7093ab39ae9374326091eb5e166d217c11;hpb=314291057be8864871100eaaaa291a9049ca9a65;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 9654bb7093..456facef12 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -95,7 +95,8 @@ class SpecialUndelete extends SpecialPage {
 		$this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $user->isAllowed( 'suppressrevision' );
 		$this->mToken = $request->getVal( 'token' );
 
-		if ( $this->isAllowed( 'undelete' ) && !$user->isBlocked() ) {
+		$block = $user->getBlock();
+		if ( $this->isAllowed( 'undelete' ) && !( $block && $block->isSitewide() ) ) {
 			$this->mAllowed = true; // user can restore
 			$this->mCanView = true; // user can view content
 		} elseif ( $this->isAllowed( 'deletedtext' ) ) {
@@ -199,7 +200,7 @@ class SpecialUndelete extends SpecialPage {
 			} else {
 				$this->showFile( $this->mFilename );
 			}
-		} elseif ( $this->mAction === "submit" ) {
+		} elseif ( $this->mAction === 'submit' ) {
 			if ( $this->mRestore ) {
 				$this->undelete();
 			} elseif ( $this->mRevdel ) {
@@ -223,13 +224,14 @@ class SpecialUndelete extends SpecialPage {
 		foreach ( $this->getRequest()->getValues() as $key => $val ) {
 			$matches = [];
 			if ( preg_match( "/^ts(\d{14})$/", $key, $matches ) ) {
-				$revisions[ $archive->getRevision( $matches[1] )->getId() ] = 1;
+				$revisions[$archive->getRevision( $matches[1] )->getId()] = 1;
 			}
 		}
+
 		$query = [
-			"type" => "revision",
-			"ids" => $revisions,
-			"target" => $this->mTargetObj->getPrefixedText()
+			'type' => 'revision',
+			'ids' => $revisions,
+			'target' => $this->mTargetObj->getPrefixedText()
 		];
 		$url = SpecialPage::getTitleFor( 'Revisiondelete' )->getFullURL( $query );
 		$this->getOutput()->redirect( $url );
@@ -455,7 +457,7 @@ class SpecialUndelete extends SpecialPage {
 			Message::rawParam( $link ), $time,
 			Message::rawParam( $userLink ), $d, $t
 		);
-		$out->addHtml( '</div>' );
+		$out->addHTML( '</div>' );
 
 		if ( !Hooks::run( 'UndeleteShowRevision', [ $this->mTargetObj, $rev ] ) ) {
 			return;
@@ -493,7 +495,7 @@ class SpecialUndelete extends SpecialPage {
 				'readonly' => 'readonly',
 				'cols' => 80,
 				'rows' => 25
-			], $content->getNativeData() . "\n" );
+			], $content->getText() . "\n" );
 
 			$buttonFields[] = new OOUI\ButtonInputWidget( [
 				'type' => 'submit',
@@ -502,7 +504,6 @@ class SpecialUndelete extends SpecialPage {
 			] );
 		} else {
 			$sourceView = '';
-			$previewButton = '';
 		}
 
 		$buttonFields[] = new OOUI\ButtonInputWidget( [
@@ -548,7 +549,6 @@ class SpecialUndelete extends SpecialPage {
 	 *
 	 * @param Revision $previousRev
 	 * @param Revision $currentRev
-	 * @return string HTML
 	 */
 	function showDiff( $previousRev, $currentRev ) {
 		$diffContext = clone $this->getContext();
@@ -687,7 +687,7 @@ class SpecialUndelete extends SpecialPage {
 
 		$repo = RepoGroup::singleton()->getLocalRepo();
 		$path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key;
-		$repo->streamFile( $path );
+		$repo->streamFileWithStatus( $path );
 	}
 
 	protected function showHistory() {