From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
---
 .../resourceloader/ResourceLoaderUserModule.php    | 57 +++++++++++++---------
 1 file changed, 33 insertions(+), 24 deletions(-)

(limited to 'includes/resourceloader/ResourceLoaderUserModule.php')

diff --git a/includes/resourceloader/ResourceLoaderUserModule.php b/includes/resourceloader/ResourceLoaderUserModule.php
index 338b6322..177302c5 100644
--- a/includes/resourceloader/ResourceLoaderUserModule.php
+++ b/includes/resourceloader/ResourceLoaderUserModule.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Resource loader module for user customizations.
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -33,33 +35,40 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
 	 * @return array
 	 */
 	protected function getPages( ResourceLoaderContext $context ) {
-		if ( $context->getUser() ) {
-			// Get the normalized title of the user's user page
-			$username = $context->getUser();
-			$userpageTitle = Title::makeTitleSafe( NS_USER, $username );
-			$userpage = $userpageTitle->getPrefixedDBkey(); // Needed so $excludepages works
+		$username = $context->getUser();
+
+		if ( $username === null ) {
+			return array();
+		}
+
+		// Get the normalized title of the user's user page
+		$userpageTitle = Title::makeTitleSafe( NS_USER, $username );
+
+		if ( !$userpageTitle instanceof Title ) {
+			return array();
+		}
+
+		$userpage = $userpageTitle->getPrefixedDBkey(); // Needed so $excludepages works
 
-			$pages = array(
-				"$userpage/common.js" => array( 'type' => 'script' ),
-				"$userpage/" . $context->getSkin() . '.js' =>
-					array( 'type' => 'script' ),
-				"$userpage/common.css" => array( 'type' => 'style' ),
-				"$userpage/" . $context->getSkin() . '.css' =>
-					array( 'type' => 'style' ),
-			);
+		$pages = array(
+			"$userpage/common.js" => array( 'type' => 'script' ),
+			"$userpage/" . $context->getSkin() . '.js' =>
+				array( 'type' => 'script' ),
+			"$userpage/common.css" => array( 'type' => 'style' ),
+			"$userpage/" . $context->getSkin() . '.css' =>
+				array( 'type' => 'style' ),
+		);
 
-			// Hack for bug 26283: if we're on a preview page for a CSS/JS page,
-			// we need to exclude that page from this module. In that case, the excludepage
-			// parameter will be set to the name of the page we need to exclude.
-			$excludepage = $context->getRequest()->getVal( 'excludepage' );
-			if ( isset( $pages[$excludepage] ) ) {
-				// This works because $excludepage is generated with getPrefixedDBkey(),
-				// just like the keys in $pages[] above
-				unset( $pages[$excludepage] );
-			}
-			return $pages;
+		// Hack for bug 26283: if we're on a preview page for a CSS/JS page,
+		// we need to exclude that page from this module. In that case, the excludepage
+		// parameter will be set to the name of the page we need to exclude.
+		$excludepage = $context->getRequest()->getVal( 'excludepage' );
+		if ( isset( $pages[$excludepage] ) ) {
+			// This works because $excludepage is generated with getPrefixedDBkey(),
+			// just like the keys in $pages[] above
+			unset( $pages[$excludepage] );
 		}
-		return array();
+		return $pages;
 	}
 
 	/* Methods */
-- 
cgit v1.2.3-54-g00ecf