From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Fri, 10 Sep 2010 23:28:59 +0000 (+0000)
Subject: Moved some of the logic for generating styles from wiki pages out of ResourceLoaderSi... 
X-Git-Tag: 1.31.0-rc.0~35027
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=eeb5ce5150dbd4eb31a6177945998143e7ddbbf9;p=lhc%2Fweb%2Fwiklou.git

Moved some of the logic for generating styles from wiki pages out of ResourceLoaderSiteModule and into ResourceLoaderWikiModule.
---

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index d6a65ca368..832d116ae8 100644
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -21,7 +21,7 @@
  */
 
 /**
- * Interface for resource loader modules, with name registration and maxage functionality.
+ * Abstraction for resource loader modules, with name registration and maxage functionality.
  */
 abstract class ResourceLoaderModule {
 	/* Protected Members */
@@ -674,6 +674,9 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 	}
 }
 
+/**
+ * Abstraction for resource loader modules which pull from wiki pages
+ */
 abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
 	
 	/* Protected Members */
@@ -685,6 +688,23 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
 	
 	abstract protected function getPages( ResourceLoaderContext $context );
 	
+	/* Protected Methods */
+	
+	protected function getStyleCode( array $styles ) {
+		foreach ( $styles as $media => $messages ) {
+			foreach ( $messages as $i => $message ) {
+				$style = wfMsgExt( $message, 'content' );
+				if ( !wfEmptyMsg( $message, $style ) ) {
+					$styles[$media][$i] = $style;
+				}
+			}
+		}
+		foreach ( $styles as $media => $messages ) {
+			$styles[$media] = implode( "\n", $messages );
+		}
+		return $styles;
+	}
+	
 	/* Methods */
 	
 	public function getModifiedTime( ResourceLoaderContext $context ) {
@@ -713,7 +733,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
 }
 
 /**
- * Custom module for MediaWiki:Common.js and MediaWiki:Skinname.js
+ * Custom module for site customizations
  */
 class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 
@@ -752,18 +772,7 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 		if ( $wgHandheldStyle ) {
 			$sources['handheld'] = array( 'Handheld.css' );
 		}
-		foreach ( $styles as $media => $messages ) {
-			foreach ( $messages as $i => $message ) {
-				$style = wfMsgExt( $message, 'content' );
-				if ( !wfEmptyMsg( $message, $style ) ) {
-					$styles[$media][$i] = $style;
-				}
-			}
-		}
-		foreach ( $styles as $media => $messages ) {
-			$styles[$media] = implode( "\n", $messages );
-		}
-		return $styles;
+		return $this->getStyleCode( $styles );
 	}
 }