| Index: branches/REL1_17/phase3/includes/OutputPage.php |
| — | — | @@ -2376,15 +2376,6 @@ |
| 2377 | 2377 | $resourceLoader = $this->getResourceLoader(); |
| 2378 | 2378 | foreach ( (array) $modules as $name ) { |
| 2379 | 2379 | $module = $resourceLoader->getModule( $name ); |
| 2380 | | - # Check that we're allowed to include this module on this page |
| 2381 | | - if ( ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) |
| 2382 | | - && $only == ResourceLoaderModule::TYPE_SCRIPTS ) |
| 2383 | | - || ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_STYLES ) |
| 2384 | | - && $only == ResourceLoaderModule::TYPE_STYLES ) |
| 2385 | | - ) |
| 2386 | | - { |
| 2387 | | - continue; |
| 2388 | | - } |
| 2389 | 2380 | |
| 2390 | 2381 | $group = $module->getGroup(); |
| 2391 | 2382 | if ( !isset( $groups[$group] ) ) { |
| — | — | @@ -2728,8 +2719,8 @@ |
| 2729 | 2720 | // 'private' at present only contains user.options, so put that before 'user' |
| 2730 | 2721 | // Any future private modules will likely have a similar user-specific character |
| 2731 | 2722 | foreach ( array( 'site', 'private', 'user' ) as $group ) { |
| 2732 | | - $ret .= $this->makeResourceLoaderLink( $sk, $styles[$group], |
| 2733 | | - ResourceLoaderModule::TYPE_STYLES |
| | 2723 | + $ret .= $this->makeResourceLoaderLink( |
| | 2724 | + $sk, array_merge( $styles['site'], $styles['user'] ), 'styles' |
| 2734 | 2725 | ); |
| 2735 | 2726 | } |
| 2736 | 2727 | return $ret; |