X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderWikiModule.php;h=52eb2d81be4ff61111e7627c2238aa3a944e9acb;hb=a218a56b774ffa5163c0a01f092a12990132c48d;hp=a4d94f8fd689ecf2b96bc1ff10c98be65d85f54a;hpb=f8ab4e5ffee1cfb53da38d3dffcd37ffe4e2abbc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index a4d94f8fd6..52eb2d81be 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Abstraction for resource loader modules which pull from wiki pages.
+ * Abstraction for ResourceLoader modules that pull from wiki pages.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
  */
 
 /**
- * Abstraction for resource loader modules which pull from wiki pages
+ * Abstraction for ResourceLoader modules which pull from wiki pages
  *
  * This can only be used for wiki pages in the MediaWiki and User namespaces,
  * because of its dependence on the functionality of Title::isCssJsSubpage.
@@ -72,8 +72,6 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 		foreach ( $options as $member => $option ) {
 			switch ( $member ) {
 				case 'position':
-					$this->isPositionDefined = true;
-					// Don't break since we need the member set as well
 				case 'styles':
 				case 'scripts':
 				case 'group':
@@ -149,7 +147,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 	 */
 	protected function getContent( $titleText ) {
 		$title = Title::newFromText( $titleText );
-		if ( !$title || $title->isRedirect() ) {
+		if ( !$title ) {
 			return null;
 		}
 
@@ -214,7 +212,8 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 			if ( $this->getFlip( $context ) ) {
 				$style = CSSJanus::transform( $style, true, false );
 			}
-			$style = CSSMin::remap( $style, false, $this->getConfig()->get( 'ScriptPath' ), true );
+			$style = MemoizedCallable::call( 'CSSMin::remap',
+				array( $style, false, $this->getConfig()->get( 'ScriptPath' ), true ) );
 			if ( !isset( $styles[$media] ) ) {
 				$styles[$media] = array();
 			}