svnno****@sourc*****
svnno****@sourc*****
2008年 3月 3日 (月) 20:14:27 JST
SRADRevision: 526
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=526
Author: tach
Date: 2008-03-03 20:14:27 +0900 (Mon, 03 Mar 2008)
Log Message:
-----------
merged from 2.5.0.192 branch to fix newuser email message
Modified Paths:
--------------
slashjp/trunk/plugins/Login/login.pl
-------------- next part --------------
Modified: slashjp/trunk/plugins/Login/login.pl
===================================================================
--- slashjp/trunk/plugins/Login/login.pl 2008-03-03 11:10:18 UTC (rev 525)
+++ slashjp/trunk/plugins/Login/login.pl 2008-03-03 11:14:27 UTC (rev 526)
@@ -278,6 +278,7 @@
my $newpasswd = $slashdb->getNewPasswd($uid);
my $tempnick = $user_send->{nickname};
my $subject = getData('mail_subject', { nickname => $user_send->{nickname} });
+ my $mail_template = $form->{op} eq "newuser" ? "mail_msg_newuser" : "mail_msg";
# Pull out some data passed in with the request. Only the IP
# number is actually trustworthy, the others could be forged.
@@ -295,7 +296,7 @@
$ua =~ s/\s+/ /g;
$ua = substr(strip_attribute($ua), 0, 60);
- my $msg = getData('mail_msg', {
+ my $msg = getData($mail_template, {
newpasswd => $newpasswd,
tempnick => $tempnick,
remote_ip => $remote_ip,