Merge "OutputPage.php: Use descriptive $variant instead of $_v as local variable"

diff --combined includes/OutputPage.php
index 22c6890,247c53b..a551fe1
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -3433,11 -3433,11 +3433,11 @@@ class OutputPage extends ContextSource 
                        $lang = $this->getTitle()->getPageLanguage();
                        if ( $lang->hasVariants() ) {
                                $variants = $lang->getVariants();
-                               foreach ( $variants as $_v ) {
-                                       $tags["variant-$_v"] = Html::element( 'link', array(
+                               foreach ( $variants as $variant ) {
+                                       $tags["variant-$variant"] = Html::element( 'link', array(
                                                'rel' => 'alternate',
-                                               'hreflang' => wfBCP47( $_v ),
-                                               'href' => $this->getTitle()->getLocalURL( array( 'variant' => $_v ) ) )
+                                               'hreflang' => wfBCP47( $variant ),
+                                               'href' => $this->getTitle()->getLocalURL( array( 'variant' => $variant ) ) )
                                        );
                                }
                                # x-default link per https://support.google.com/webmasters/answer/189077?hl=en
@@@ -3952,14 -3952,7 +3952,14 @@@
         * @since 1.25
         */
        public function enableOOUI() {
 -              OOUI\Theme::setSingleton( new OOUI\MediaWikiTheme() );
 +              $themes = ExtensionRegistry::getInstance()->getAttribute( 'SkinOOUIThemes' );
 +              // Make keys (skin names) lowercase for case-insensitive matching.
 +              $themes = array_change_key_case( $themes, CASE_LOWER );
 +              $skinName = strtolower( $this->getSkin()->getSkinName() );
 +              $theme = isset( $themes[ $skinName ] ) ? $themes[ $skinName ] : 'MediaWiki';
 +              // For example, 'OOUI\MediaWikiTheme'.
 +              $themeClass = "OOUI\\{$theme}Theme";
 +              OOUI\Theme::setSingleton( new $themeClass() );
                OOUI\Element::setDefaultDir( $this->getLanguage()->getDir() );
                $this->addModuleStyles( array(
                        'oojs-ui.styles',