Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 4 insertions, 9 deletions

diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php b/includes/resourceloader/ResourceLoaderSiteModule.php
index 1d9721aa..19e0baeb 100644
--- a/includes/resourceloader/ResourceLoaderSiteModule.php
+++ b/includes/resourceloader/ResourceLoaderSiteModule.php
@@ -27,13 +27,10 @@
  */
 class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 
-	/* Protected Methods */
-
 	/**
-	 * Gets list of pages used by this module
+	 * Get list of pages used by this module
 	 *
 	 * @param ResourceLoaderContext $context
-	 *
 	 * @return array List of pages
 	 */
 	protected function getPages( ResourceLoaderContext $context ) {
@@ -45,18 +42,16 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 		if ( $this->getConfig()->get( 'UseSiteCss' ) ) {
 			$pages['MediaWiki:Common.css'] = array( 'type' => 'style' );
 			$pages['MediaWiki:' . ucfirst( $context->getSkin() ) . '.css'] = array( 'type' => 'style' );
+			$pages['MediaWiki:Print.css'] = array( 'type' => 'style', 'media' => 'print' );
 
 		}
-		$pages['MediaWiki:Print.css'] = array( 'type' => 'style', 'media' => 'print' );
 		return $pages;
 	}
 
-	/* Methods */
-
 	/**
-	 * Gets group name
+	 * Get group name
 	 *
-	 * @return string Name of group
+	 * @return string
 	 */
 	public function getGroup() {
 		return 'site';