oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge to 10219

Browse source
This commit is contained in:
Colin Kuskie 2009-04-08 16:35:31 +00:00
parent ae28bf79c8
commit 4c1307e3d0
194 changed files with 8203 additions and 2134 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/WebGUI/Inbox/Message.pm
View file

@ -163,14 +163,9 @@ sub create {
$preface = sprintf($i18n->get('from user preface'), $fromUser->username);
}
my $msg = (defined $properties->{emailMessage}) ? $properties->{emailMessage} : $self->{_properties}{message};
if ($msg =~ m/\<.*\>/) {
$msg = '<p>' . $preface . '</p><br />'.$msg if($preface ne "");
$mail->addHtml($msg);
} else {
$msg = $preface."\n\n".$msg if($preface ne "");
$mail->addText($msg);
}
$mail->addFooter;
$msg = '<p>' . $preface . '</p><br />'.$msg if($preface ne "");
$mail->addHtml($msg);
$mail->addFooter;
$mail->queue;
}
$self->{_session} = $session;