diff --git a/modules/user/user.module b/modules/user/user.module index 5124207..3ecc95d 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2314,7 +2314,10 @@ function user_external_login_register($name, $module) { * Generates a unique URL for a user to login and reset their password. * * @param object $account - * An object containing the user account. + * An object containing the user account, which must contain at least the + * following properties: + * - uid: The user ID number. + * - login: The UNIX timestamp of the user's last login. * * @return * A unique URL that provides a one-time log in for the user, from which @@ -2331,9 +2334,9 @@ function user_pass_reset_url($account) { * @param object $account * The user account object, which must contain at least the following * properties: - * - uid: The user uid number. + * - uid: The user ID number. * - pass: The hashed user password string. - * - login: The user login name. + * - login: The UNIX timestamp of the user's last login. * * @return * A unique URL that may be used to confirm the cancellation of the user @@ -2355,15 +2358,15 @@ function user_cancel_url($account) { * order to validate the URL, the same hash can be generated again, from the * same information, and compared to the hash value from the URL. The URL * normally contains both the time stamp and the numeric user ID. The login - * name and hashed password are retrieved from the database as necessary. For a - * usage example, see user_cancel_url() and user_cancel_confirm(). + * timestamp and hashed password are retrieved from the database as necessary. + * For a usage example, see user_cancel_url() and user_cancel_confirm(). * - * @param $password + * @param string $password * The hashed user account password value. - * @param $timestamp - * A unix timestamp. - * @param $login - * The user account login name. + * @param int $timestamp + * A UNIX timestamp, typically REQUEST_TIME. + * @param int $login + * The UNIX timestamp of the user's last login. * * @return * A string that is safe for use in URLs and SQL statements. @@ -2834,7 +2837,7 @@ Your account on [site:name] has been canceled. * An associative array of token replacement values. If the 'user' element * exists, it must contain a user account object with the following * properties: - * - login: The account login name. + * - login: The UNIX timestamp of the user's last login. * - pass: The hashed account login password. * @param $options * Unused parameter required by the token_replace() function.