From 8a9a5ba3da89822aa81481a1072f97eb9b0f4a64 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 15 Jun 2003 19:17:43 +0000 Subject: [PATCH] - Bugfix: the variable 'user_mail_welcome_approval_subject' was too long. Modified patch from Al; used 'user_mail_approval_subject' instead of 'user_mail_welcome_approval_subj'. Patch #11 by Al. Fixes bug #1976. --- modules/user.module | 8 ++++---- modules/user/user.module | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/user.module b/modules/user.module index 6d4680c790d..233da2b96f3 100644 --- a/modules/user.module +++ b/modules/user.module @@ -866,8 +866,8 @@ function user_register($edit = array()) { /* ** Create new user account, administrator approval required: */ - $subject = strtr(variable_get("user_mail_welcome_approval_subject", _user_mail_text("welcome_approval_subject")), $variables); - $body = strtr(variable_get("user_mail_welcome_approval_body", _user_mail_text("welcome_approval_body")), $variables); + $subject = strtr(variable_get("user_mail_approval_subject", _user_mail_text("welcome_approval_subject")), $variables); + $body = strtr(variable_get("user_mail_approval_body", _user_mail_text("welcome_approval_body")), $variables); user_mail($edit["mail"], $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); user_mail(variable_get("site_mail", ini_get("sendmail_from")), $subject, t("%u has applied for an account.\n\n%uri", array("%u" => $account->name, "%uri" => url("admin/user/edit/$account->uid"))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); return t("Thank you for applying for an account. Your account is currently pending approval by the site administrator.
In the meantime, your password and further instructions have been sent to your e-mail address."); @@ -1199,9 +1199,9 @@ function user_settings() { $output .= form_textarea(t("Body of welcome e-mail"), "user_mail_welcome_body", variable_get("user_mail_welcome_body", _user_mail_text("welcome_body")), 70, 10, t("Customize the body of the welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto"); - $output .= form_textfield(t("Subject of welcome e-mail (awaiting admin approval)"), "user_mail_welcome_approval_subject", variable_get("user_mail_welcome_approval_subject", _user_mail_text("welcome_approval_subject")), 70, 180, t("Customize the subject of your awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto, %date"); + $output .= form_textfield(t("Subject of welcome e-mail (awaiting admin approval)"), "user_mail_approval_subject", variable_get("user_mail_approval_subject", _user_mail_text("welcome_approval_subject")), 70, 180, t("Customize the subject of your awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto, %date"); - $output .= form_textarea(t("Body of welcome e-mail (awaiting admin approval)"), "user_mail_welcome_approval_body", variable_get("user_mail_welcome_approval_body", _user_mail_text("welcome_approval_body")), 70, 10, t("Customize the body of the awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto"); + $output .= form_textarea(t("Body of welcome e-mail (awaiting admin approval)"), "user_mail_approval_body", variable_get("user_mail_approval_body", _user_mail_text("welcome_approval_body")), 70, 10, t("Customize the body of the awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto"); $output .= form_textfield(t("Subject of password recovery e-mail"), "user_mail_pass_subject", variable_get("user_mail_pass_subject", _user_mail_text("pass_subject")), 70, 180, t("Customize the Subject of your forgotten password e-mail.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto, %date"); diff --git a/modules/user/user.module b/modules/user/user.module index 6d4680c790d..233da2b96f3 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -866,8 +866,8 @@ function user_register($edit = array()) { /* ** Create new user account, administrator approval required: */ - $subject = strtr(variable_get("user_mail_welcome_approval_subject", _user_mail_text("welcome_approval_subject")), $variables); - $body = strtr(variable_get("user_mail_welcome_approval_body", _user_mail_text("welcome_approval_body")), $variables); + $subject = strtr(variable_get("user_mail_approval_subject", _user_mail_text("welcome_approval_subject")), $variables); + $body = strtr(variable_get("user_mail_approval_body", _user_mail_text("welcome_approval_body")), $variables); user_mail($edit["mail"], $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); user_mail(variable_get("site_mail", ini_get("sendmail_from")), $subject, t("%u has applied for an account.\n\n%uri", array("%u" => $account->name, "%uri" => url("admin/user/edit/$account->uid"))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); return t("Thank you for applying for an account. Your account is currently pending approval by the site administrator.
In the meantime, your password and further instructions have been sent to your e-mail address."); @@ -1199,9 +1199,9 @@ function user_settings() { $output .= form_textarea(t("Body of welcome e-mail"), "user_mail_welcome_body", variable_get("user_mail_welcome_body", _user_mail_text("welcome_body")), 70, 10, t("Customize the body of the welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto"); - $output .= form_textfield(t("Subject of welcome e-mail (awaiting admin approval)"), "user_mail_welcome_approval_subject", variable_get("user_mail_welcome_approval_subject", _user_mail_text("welcome_approval_subject")), 70, 180, t("Customize the subject of your awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto, %date"); + $output .= form_textfield(t("Subject of welcome e-mail (awaiting admin approval)"), "user_mail_approval_subject", variable_get("user_mail_approval_subject", _user_mail_text("welcome_approval_subject")), 70, 180, t("Customize the subject of your awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto, %date"); - $output .= form_textarea(t("Body of welcome e-mail (awaiting admin approval)"), "user_mail_welcome_approval_body", variable_get("user_mail_welcome_approval_body", _user_mail_text("welcome_approval_body")), 70, 10, t("Customize the body of the awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto"); + $output .= form_textarea(t("Body of welcome e-mail (awaiting admin approval)"), "user_mail_approval_body", variable_get("user_mail_approval_body", _user_mail_text("welcome_approval_body")), 70, 10, t("Customize the body of the awaiting approval welcome e-mail, which is sent to new members upon registering.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto"); $output .= form_textfield(t("Subject of password recovery e-mail"), "user_mail_pass_subject", variable_get("user_mail_pass_subject", _user_mail_text("pass_subject")), 70, 180, t("Customize the Subject of your forgotten password e-mail.") . " " . t("Available variables are:") . " " . "%username, %site, %password, %uri, %uri_brief, %mailto, %date");