Merge "Fix unexpected return type of User::idFromName()"

[lhc/web/wiklou.git] / includes / user / User.php

diff --git a/includes/user/User.php b/includes/user/User.php
index 40511cf..0e04946 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -935,7 +935,7 @@ class User implements IDBAccessObject, UserIdentity {
                if ( $s === false ) {
                        $result = null;
                } else {
-                       $result = $s->user_id;
+                       $result = (int)$s->user_id;
                }
 
                self::$idCacheByName[$name] = $result;