Commit 911bc724 authored by webchick's avatar webchick
Browse files

Issue #1416212 by pontus_nilsson: Fixed _user_mail_notify() -- options for need to be a list.

parent ecfa526b
...@@ -3476,23 +3476,27 @@ function user_preferred_language($account, $default = NULL) { ...@@ -3476,23 +3476,27 @@ function user_preferred_language($account, $default = NULL) {
* @see drupal_mail() * @see drupal_mail()
* *
* @param $op * @param $op
* The operation being performed on the account. Possible values: * The operation being performed on the account. Possible values:
* 'register_admin_created': Welcome message for user created by the admin * - 'register_admin_created': Welcome message for user created by the admin.
* 'register_no_approval_required': Welcome message when user self-registers * - 'register_no_approval_required': Welcome message when user
* 'register_pending_approval': Welcome message, user pending admin approval * self-registers.
* 'password_reset': Password recovery request * - 'register_pending_approval': Welcome message, user pending admin
* 'status_activated': Account activated * approval.
* 'status_blocked': Account blocked * - 'password_reset': Password recovery request.
* 'cancel_confirm': Account cancellation request * - 'status_activated': Account activated.
* 'status_canceled': Account canceled * - 'status_blocked': Account blocked.
* - 'cancel_confirm': Account cancellation request.
* - 'status_canceled': Account canceled.
* *
* @param $account * @param $account
* The user object of the account being notified. Must contain at * The user object of the account being notified. Must contain at
* least the fields 'uid', 'name', and 'mail'. * least the fields 'uid', 'name', and 'mail'.
* @param $language * @param $language
* Optional language to use for the notification, overriding account language. * Optional language to use for the notification, overriding account language.
*
* @return * @return
* The return value from drupal_mail_system()->mail(), if ends up being called. * The return value from drupal_mail_system()->mail(), if ends up being
* called.
*/ */
function _user_mail_notify($op, $account, $language = NULL) { function _user_mail_notify($op, $account, $language = NULL) {
// By default, we always notify except for canceled and blocked. // By default, we always notify except for canceled and blocked.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment