Merge "Fix unused vars/pointless assignments"

diff --combined includes/specials/SpecialUndelete.php
index c5c68df,bfa39d1..51d6fd9
--- 1/includes/specials/SpecialUndelete.php
--- 2/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@@ -95,8 -95,7 +95,8 @@@ class SpecialUndelete extends SpecialPa
                $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' ) ) {
@@@ -504,7 -503,6 +504,6 @@@
                        ] );
                } else {
                        $sourceView = '';
-                       $previewButton = '';
                }
  
                $buttonFields[] = new OOUI\ButtonInputWidget( [