summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorKjartan Mannes <kjartan@2.no-reply.drupal.org>2002-02-20 22:44:25 +0000
committerKjartan Mannes <kjartan@2.no-reply.drupal.org>2002-02-20 22:44:25 +0000
commit64c1b5f1106136964cfb3ea31420649d91ef97c4 (patch)
tree37619c3a02efdefa10c98cfa21df274692efd925 /modules/user/user.module
parentfc88037a63cb47733f05496e55ba97fd55cdc291 (diff)
downloadbrdo-64c1b5f1106136964cfb3ea31420649d91ef97c4.tar.gz
brdo-64c1b5f1106136964cfb3ea31420649d91ef97c4.tar.bz2
- updated configuration/user.module to use ini_get("sendmail_from") as
default value.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index df2e522bb..5fb552a2e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -781,7 +781,7 @@ function user_pass($edit = array()) {
if ($edit["name"] && $edit["mail"]) {
if ($account = db_fetch_object(db_query("SELECT uid FROM users WHERE name = '". check_input($edit["name"]) ."' AND mail = '". check_input($edit["mail"]) ."'"))) {
- $from = variable_get("site_mail", "root@localhost");
+ $from = variable_get("site_mail", ini_get("sendmail_from"));
$pass = user_password();
/*
@@ -867,7 +867,7 @@ function user_register($edit = array()) {
watchdog("user", "new user: '". $edit["name"] ."' &lt;". $edit["mail"] ."&gt;");
- $from = variable_get("site_mail", "root@localhost");
+ $from = variable_get("site_mail", ini_get("sendmail_from"));
$pass = user_password();
if (variable_get("user_register", 1) == 1) {