X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderWikiModule.php;h=6eddfc0923517ef9a529d2a22b61e642bf05e0ea;hb=16ef3e79c4c52aa6b74563b7eadcfc9792e7a4c4;hp=fd31eac778a7d3cb47e46b6f5723576fd5d61a2b;hpb=6fbafe5494440f5c37686b250ed759f6a96271b9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index fd31eac778..6eddfc0923 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -183,12 +183,10 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 	 * @return Content|null
 	 */
 	protected function getContentObj( Title $title ) {
-		$revision = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $title->getArticleID(),
-			$title->getLatestRevID() );
+		$revision = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $title );
 		if ( !$revision ) {
 			return null;
 		}
-		$revision->setTitle( $title );
 		$content = $revision->getContent( Revision::RAW );
 		if ( !$content ) {
 			wfDebugLog( 'resourceloader', __METHOD__ . ': failed to load content of JS/CSS page!' );
@@ -373,7 +371,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 			if ( $module instanceof self ) {
 				$mDB = $module->getDB();
 				// Subclasses may disable getDB and implement getTitleInfo differently
-				if ( $mDB && $mDB->getWikiID() === $db->getWikiID() ) {
+				if ( $mDB && $mDB->getDomainID() === $db->getDomainID() ) {
 					$wikiModules[] = $module;
 					$allPages += $module->getPages( $context );
 				}
@@ -395,14 +393,17 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 
 		$cache = ObjectCache::getMainWANInstance();
 		$allInfo = $cache->getWithSetCallback(
-			$cache->makeGlobalKey( 'resourceloader', 'titleinfo', $db->getWikiID(), $hash ),
+			$cache->makeGlobalKey( 'resourceloader', 'titleinfo', $db->getDomainID(), $hash ),
 			$cache::TTL_HOUR,
 			function ( $curVal, &$ttl, array &$setOpts ) use ( $func, $pageNames, $db, $fname ) {
 				$setOpts += Database::getCacheSetOptions( $db );
 
 				return call_user_func( $func, $db, $pageNames, $fname );
 			},
-			[ 'checkKeys' => [ $cache->makeGlobalKey( 'resourceloader', 'titleinfo', $db->getWikiID() ) ] ]
+			[
+				'checkKeys' => [
+					$cache->makeGlobalKey( 'resourceloader', 'titleinfo', $db->getDomainID() ) ]
+			]
 		);
 
 		foreach ( $wikiModules as $wikiModule ) {