jenkins-bot has submitted this change and it was merged. Change subject: Revert "Set site logo url in ResourceLoaderSiteModule instead of inline styles" ......................................................................
Revert "Set site logo url in ResourceLoaderSiteModule instead of inline styles" This caused bug 71334. The logo should be split out into its own ResourceLoader module rather than being in the site module. This reverts commit efe0169c591d4987872143a3760228a694af33c4. Bug: 71334 Change-Id: I0234e78f93c2eb6574bae4ad48941498709ae528 (cherry picked from commit 099602556d710809d86d566c0f7afffac37b5005) --- M RELEASE-NOTES-1.25 M includes/resourceloader/ResourceLoaderSiteModule.php 2 files changed, 0 insertions(+), 45 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index 9dbf896..69fafe5 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -31,8 +31,6 @@ 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 6de3d73..1d9721a 100644 --- a/includes/resourceloader/ResourceLoaderSiteModule.php +++ b/includes/resourceloader/ResourceLoaderSiteModule.php @@ -54,49 +54,6 @@ /* 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/163024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0234e78f93c2eb6574bae4ad48941498709ae528 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Legoktm <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: MaxSem <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
