dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add ParserOutputStashForEdit hook for extension cache warming"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderWikiModule.php
diff --git
a/includes/resourceloader/ResourceLoaderWikiModule.php
b/includes/resourceloader/ResourceLoaderWikiModule.php
index
0023de2
..
52eb2d8
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/
includes/resourceloader/ResourceLoaderWikiModule.php
@@
-1,6
+1,6
@@
<?php
/**
<?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
*
* 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 l
oader modules which pull from wiki pages
+ * Abstraction for
ResourceL
oader 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.
*
* 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':
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':
case 'styles':
case 'scripts':
case 'group':
@@
-214,7
+212,8
@@
class ResourceLoaderWikiModule extends ResourceLoaderModule {
if ( $this->getFlip( $context ) ) {
$style = CSSJanus::transform( $style, true, false );
}
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();
}
if ( !isset( $styles[$media] ) ) {
$styles[$media] = array();
}