X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=969171d6543c2f2bcd2d59ab4de25b8659f61703;hb=50ea235528289fa3b7b31a2281c6c7683053b7f4;hp=e22f42ce213066c7c3c90671f2b238faebee4e2d;hpb=2ffe624b5a2251000ccaf86e016387affd41839d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e22f42ce21..969171d654 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -295,7 +295,7 @@ class OutputPage extends ContextSource {
 	private $mEnableSectionEditLinks = true;
 
 	/**
-	 * @var string|null The URL to send in a <link> element with rel=copyright
+	 * @var string|null The URL to send in a <link> element with rel=license
 	 */
 	private $copyrightUrl;
 
@@ -3446,7 +3446,7 @@ class OutputPage extends ContextSource {
 
 		if ( $copyright ) {
 			$tags['copyright'] = Html::element( 'link', [
-				'rel' => 'copyright',
+				'rel' => 'license',
 				'href' => $copyright ]
 			);
 		}
@@ -3952,12 +3952,10 @@ class OutputPage extends ContextSource {
 	 * @param String $skinName The Skin name to determine the correct OOUI theme
 	 * @param String $dir Language direction
 	 */
-	public static function setupOOUI( $skinName = '', $dir = 'ltr' ) {
-		$themes = ExtensionRegistry::getInstance()->getAttribute( 'SkinOOUIThemes' );
-		// Make keys (skin names) lowercase for case-insensitive matching.
-		$themes = array_change_key_case( $themes, CASE_LOWER );
-		$theme = isset( $themes[$skinName] ) ? $themes[$skinName] : 'MediaWiki';
-		// For example, 'OOUI\MediaWikiTheme'.
+	public static function setupOOUI( $skinName = 'default', $dir = 'ltr' ) {
+		$themes = ResourceLoaderOOUIModule::getSkinThemeMap();
+		$theme = isset( $themes[$skinName] ) ? $themes[$skinName] : $themes['default'];
+		// For example, 'OOUI\WikimediaUITheme'.
 		$themeClass = "OOUI\\{$theme}Theme";
 		OOUI\Theme::setSingleton( new $themeClass() );
 		OOUI\Element::setDefaultDir( $dir );
@@ -3976,10 +3974,12 @@ class OutputPage extends ContextSource {
 		);
 		$this->addModuleStyles( [
 			'oojs-ui-core.styles',
-			'oojs-ui.styles.icons',
 			'oojs-ui.styles.indicators',
 			'oojs-ui.styles.textures',
 			'mediawiki.widgets.styles',
+			'oojs-ui.styles.icons-content',
+			'oojs-ui.styles.icons-alerts',
+			'oojs-ui.styles.icons-interactions',
 		] );
 	}