From 4aca2af898a2d8b3af9e5143cf15a44f8dd7cdd9 Mon Sep 17 00:00:00 2001 From: Daimona Eaytoy Date: Fri, 20 Apr 2018 10:16:55 +0200 Subject: [PATCH] Fix parameter doc type for matchEditToken I noticed it while fixing some AbuseFilter errors. matchEditToken simply calls getEditTokenObject, which accepts string|array as $salt. Change-Id: I36497eb8797ee60759c5109b699643635bba9174 --- includes/user/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/user/User.php b/includes/user/User.php index 3335e59c08..b8186d6f2c 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -4559,7 +4559,7 @@ class User implements IDBAccessObject, UserIdentity { * site. * * @param string $val Input value to compare - * @param string $salt Optional function-specific data for hashing + * @param string|array $salt Optional function-specific data for hashing * @param WebRequest|null $request Object to use or null to use $wgRequest * @param int $maxage Fail tokens older than this, in seconds * @return bool Whether the token matches @@ -4573,7 +4573,7 @@ class User implements IDBAccessObject, UserIdentity { * ignoring the suffix. * * @param string $val Input value to compare - * @param string $salt Optional function-specific data for hashing + * @param string|array $salt Optional function-specific data for hashing * @param WebRequest|null $request Object to use or null to use $wgRequest * @param int $maxage Fail tokens older than this, in seconds * @return bool Whether the token matches -- 2.20.1