X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderOOUIImageModule.php;h=313d789249e5aa06c9b159c9c96d054c87af467f;hb=50da4f3be1c8a5b43e77c914edd2f72ed36474d4;hp=ee87d8d8e892f217112cfc047e40a495780473b0;hpb=aae0c8d42562d5d3f70cc18fa687ae331996b66f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php b/includes/resourceloader/ResourceLoaderOOUIImageModule.php index ee87d8d8e8..313d789249 100644 --- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php +++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php @@ -35,7 +35,7 @@ class ResourceLoaderOOUIImageModule extends ResourceLoaderImageModule { $themes = self::getSkinThemeMap(); // For backwards-compatibility, allow missing 'themeImages' - $module = isset( $this->definition['themeImages'] ) ? $this->definition['themeImages'] : ''; + $module = $this->definition['themeImages'] ?? ''; $definition = []; foreach ( $themes as $skin => $theme ) { @@ -98,11 +98,8 @@ class ResourceLoaderOOUIImageModule extends ResourceLoaderImageModule { // Extra selectors to allow using the same icons for old-style MediaWiki UI code if ( substr( $module, 0, 5 ) === 'icons' ) { $definition['selectorWithoutVariant'] = '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before'; - $definition['selectorWithVariant'] = ' - .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, - /* Hack for Flow, see T110051 */ - .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, - .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before'; + $definition['selectorWithVariant'] = '.oo-ui-image-{variant}.oo-ui-icon-{name}, ' . + '.mw-ui-icon-{name}-{variant}:before'; } // Fields from module definition silently override keys from JSON files