| Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderModule.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | */ |
| 85 | 85 | public function getStyles( ResourceLoaderContext $context ) { |
| 86 | 86 | // Stub, override expected |
| 87 | | - return ''; |
| | 87 | + return array(); |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
| Property changes on: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderModule.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 91 | 91 | Merged /branches/sqlite/includes/resourceloader/ResourceLoaderModule.php:r58211-58321 |
| 92 | 92 | Merged /trunk/phase3/includes/resourceloader/ResourceLoaderModule.php:r83590,84844 |
| 93 | 93 | Merged /branches/new-installer/phase3/includes/resourceloader/ResourceLoaderModule.php:r43664-66004 |
| 94 | 94 | Merged /branches/wmf-deployment/includes/resourceloader/ResourceLoaderModule.php:r53381,60970 |
| 95 | 95 | Merged /branches/REL1_15/phase3/includes/resourceloader/ResourceLoaderModule.php:r51646 |
| 96 | 96 | Merged /branches/wmf/1.16wmf4/includes/resourceloader/ResourceLoaderModule.php:r67177,69199,76243,77266 |