Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 6 insertions, 12 deletions

diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 55b1f4b1..081c728c 100644
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -32,7 +32,6 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule {
 
 	protected $targets = array( 'desktop', 'mobile' );
 
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return array
@@ -60,24 +59,19 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule {
 		);
 	}
 
-	public function getDependencies() {
-		return array( 'mediawiki.language.init' );
-	}
-
 	/**
 	 * @param ResourceLoaderContext $context
-	 * @return int UNIX timestamp
+	 * @return array
 	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
-		return max( 1, $this->getHashMtime( $context ) );
+	public function getDependencies( ResourceLoaderContext $context = null ) {
+		return array( 'mediawiki.language.init' );
 	}
 
 	/**
-	 * @param ResourceLoaderContext $context
-	 * @return string Hash
+	 * @return bool
 	 */
-	public function getModifiedHash( ResourceLoaderContext $context ) {
-		return md5( serialize( $this->getData( $context ) ) );
+	public function enableModuleContentVersion() {
+		return true;
 	}
 
 }