Merge "Skin: Make skins aware of their registered skin name"

diff --combined includes/skins/Skin.php
index 167b49d,f92a66f..07964a4
--- 1/includes/skins/Skin.php
--- 2/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@@ -34,7 -34,11 +34,11 @@@ use MediaWiki\MediaWikiServices
   * @ingroup Skins
   */
  abstract class Skin extends ContextSource {
+       /**
+        * @var string|null
+        */
        protected $skinname = null;
+ 
        protected $mRelevantTitle = null;
        protected $mRelevantUser = null;
  
@@@ -134,7 -138,17 +138,17 @@@
        }
  
        /**
-        * @return string Skin name
+        * @since 1.31
+        * @param string|null $skinname
+        */
+       public function __construct( $skinname = null ) {
+               if ( is_string( $skinname ) ) {
+                       $this->skinname = $skinname;
+               }
+       }
+ 
+       /**
+        * @return string|null Skin name
         */
        public function getSkinName() {
                return $this->skinname;
@@@ -1057,10 -1071,10 +1071,10 @@@
                        $targetUser = User::newFromId( $id );
                }
  
 -              # The sending user must have a confirmed email address and the target
 -              # user must have a confirmed email address and allow emails from users.
 -              return $this->getUser()->canSendEmail() &&
 -                      $targetUser->canReceiveEmail();
 +              # The sending user must have a confirmed email address and the receiving
 +              # user must accept emails from the sender.
 +              return $this->getUser()->canSendEmail()
 +                      && SpecialEmailUser::validateTarget( $targetUser, $this->getUser() ) === '';
        }
  
        /**
@@@ -1095,7 -1109,7 +1109,7 @@@
                $title = Title::newMainPage();
                self::checkTitle( $title, '' );
  
 -              return $title->getLocalURL( $urlaction );
 +              return $title->getLinkURL( $urlaction );
        }
  
        /**
@@@ -1251,10 -1265,11 +1265,10 @@@
        function buildSidebar() {
                global $wgEnableSidebarCache, $wgSidebarCacheExpiry;
  
 -              $that = $this;
 -              $callback = function () use ( $that ) {
 +              $callback = function () {
                        $bar = [];
 -                      $that->addToSidebar( $bar, 'sidebar' );
 -                      Hooks::run( 'SkinBuildSidebar', [ $that, &$bar ] );
 +                      $this->addToSidebar( $bar, 'sidebar' );
 +                      Hooks::run( 'SkinBuildSidebar', [ $this, &$bar ] );
  
                        return $bar;
                };
@@@ -1578,6 -1593,8 +1592,6 @@@
  
                $attribs = [];
                if ( !is_null( $tooltip ) ) {
 -                      # T27462: undo double-escaping.
 -                      $tooltip = Sanitizer::decodeCharReferences( $tooltip );
                        $attribs['title'] = wfMessage( 'editsectionhint' )->rawParams( $tooltip )
                                ->inLanguage( $lang )->text();
                }
@@@ -1609,7 -1626,7 +1623,7 @@@
  
                $result .= implode(
                        '<span class="mw-editsection-divider">'
 -                              . wfMessage( 'pipe-separator' )->inLanguage( $lang )->text()
 +                              . wfMessage( 'pipe-separator' )->inLanguage( $lang )->escaped()
                                . '</span>',
                        $linksHtml
                );