Permalink
Browse files

rebase

  • Loading branch information...
unknown
unknown committed Nov 22, 2011
1 parent 79906a3 commit 887801c26bcce57525216c46d769bb2c1a2306e4
@@ -334,8 +334,15 @@ public boolean configure(StaplerRequest req, JSONObject formData)
// Allow global defaults to be set for the subject and body of the email
defaultSubject = nullify(req.getParameter("ext_mailer_default_subject"));
defaultBody = nullify(req.getParameter("ext_mailer_default_body"));
+<<<<<<< HEAD
emergencyReroute = nullify(req.getParameter("ext_mailer_emergency_reroute"));
+=======
+ recipientList = nullify(req.getParameter("ext_mailer_default_recipients")) != null ?
+ req.getParameter("ext_mailer_default_recipients") : "";
+
+ emergencyReroute = nullify(req.getParameter("ext_mailer_emergency_reroute"));
+>>>>>>> simplified code, clearer help message
// convert the value into megabytes (1024 * 1024 bytes)
maxAttachmentSize = nullify(req.getParameter("ext_mailer_max_attachment_size")) != null ?
@@ -1,3 +1,3 @@
<div>
- If this field is not empty, all emails will be sent to this address alone.
+ If this field is not empty, all emails will be sent to this address (or addresses) alone.
</div>

0 comments on commit 887801c

Please sign in to comment.