From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 includes/ExternalUser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'includes/ExternalUser.php')

diff --git a/includes/ExternalUser.php b/includes/ExternalUser.php
index d1eff916..37716390 100644
--- a/includes/ExternalUser.php
+++ b/includes/ExternalUser.php
@@ -98,7 +98,7 @@ abstract class ExternalUser {
 	 * This is a wrapper around newFromId().
 	 *
 	 * @param $user User
-	 * @return mixed ExternalUser or false
+	 * @return ExternalUser|false
 	 */
 	public static function newFromUser( $user ) {
 		global $wgExternalAuthType;
@@ -293,7 +293,7 @@ abstract class ExternalUser {
 	 * @return Mixed User if the account is linked, Null otherwise.
 	 */
 	public final function getLocalUser(){
-		$dbr = wfGetDb( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow(
 			'external_user',
 			'*',
-- 
cgit v1.2.3-54-g00ecf