jenkins-bot has submitted this change and it was merged. Change subject: Set site logo url in ResourceLoaderSiteModule instead of inline styles ......................................................................
Set site logo url in ResourceLoaderSiteModule instead of inline styles Requires skins to use the 'mw-wiki-logo' class on the logo element for the styles to apply. This is backwards compatible with skins not using that class and using inline styles instead. Bug: 56257 Change-Id: I89e32fcd27c9f07e889aa5b67d7d97d06b412aea --- M RELEASE-NOTES-1.25 M includes/resourceloader/ResourceLoaderSiteModule.php 2 files changed, 45 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index c935ffe..c8bea32 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -27,6 +27,8 @@ removed. See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for migration guide for creators and users of custom skins that relied on it. * Javascript variable 'wgFileCanRotate' now only available on Special:Upload. +* (bug 56257) Set site logo url in ResourceLoaderSiteModule instead of inline + styles in the HTML output. == Compatibility == diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php b/includes/resourceloader/ResourceLoaderSiteModule.php index 1d9721a..6de3d73 100644 --- a/includes/resourceloader/ResourceLoaderSiteModule.php +++ b/includes/resourceloader/ResourceLoaderSiteModule.php @@ -54,6 +54,49 @@ /* Methods */ /** + * @param $context ResourceLoaderContext + * @return array + */ + public function getStyles( ResourceLoaderContext $context ) { + global $wgLogo; + + $styles = parent::getStyles( $context ); + $styles['all'][] = '.mw-wiki-logo { background-image: ' . + CSSMin::buildUrlValue( $wgLogo ) . + '; }'; + + return $styles; + } + + /** + * @param $context ResourceLoaderContext + * @return boolean + */ + public function isKnownEmpty( ResourceLoaderContext $context ) { + // Regardless of whether the wiki page(s) exist, we always + // provide mw-wiki-logo styles. + return false; + } + + /** + * @param $context ResourceLoaderContext + * @return int|mixed + */ + public function getModifiedTime( ResourceLoaderContext $context ) { + $parentMTime = parent::getModifiedTime( $context ); + return max( $parentMTime, $this->getHashMtime( $context ) ); + } + + /** + * @param $context ResourceLoaderContext + * @return string: Hash + */ + public function getModifiedHash( ResourceLoaderContext $context ) { + global $wgLogo; + return md5( parent::getModifiedHash( $context ) . $wgLogo ); + } + + /** * Gets group name * * @return string Name of group -- To view, visit https://gerrit.wikimedia.org/r/98356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89e32fcd27c9f07e889aa5b67d7d97d06b412aea Gerrit-PatchSet: 10 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tholam <[email protected]> Gerrit-Reviewer: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Jdlrobson <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: PleaseStand <[email protected]> Gerrit-Reviewer: Tholam <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
