summaryrefslogtreecommitdiff
path: root/includes/ExternalUser.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2011-12-03 13:29:22 +0100
committerPierre Schmitz <pierre@archlinux.de>2011-12-03 13:29:22 +0100
commitca32f08966f1b51fcb19460f0996bb0c4048e6fe (patch)
treeec04cc15b867bc21eedca904cea9af0254531a11 /includes/ExternalUser.php
parenta22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c (diff)
Update to MediaWiki 1.18.0
* also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing
Diffstat (limited to 'includes/ExternalUser.php')
-rw-r--r--includes/ExternalUser.php4
1 files changed, 2 insertions, 2 deletions
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',
'*',