From: Legoktm <legoktm.wikipedia@gmail.com>
Date: Thu, 25 Sep 2014 21:17:22 +0000 (+0000)
Subject: Revert "Set site logo url in ResourceLoaderSiteModule instead of inline styles"
X-Git-Tag: 1.31.0-rc.0~13817^2
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=099602556d710809d86d566c0f7afffac37b5005;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index c8bea32a6c..c935ffeb39 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -27,8 +27,6 @@ changes to languages because of Bugzilla reports.
   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 6de3d733b8..1d9721aa7a 100644
--- a/includes/resourceloader/ResourceLoaderSiteModule.php
+++ b/includes/resourceloader/ResourceLoaderSiteModule.php
@@ -53,49 +53,6 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 
 	/* 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
 	 *