mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 06:22:29 +00:00
bug fix
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7523 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
33fbef2770
commit
dde58616c3
1 file changed
+9
-4
@@ -357,10 +357,15 @@ public class Mailer extends Publisher {
|
||||
if(emailAddress!=null)
|
||||
return emailAddress;
|
||||
|
||||
String extractedAddress = extractAddressFromId(user.getId());
|
||||
if (extractedAddress != null)
|
||||
return extractedAddress;
|
||||
String extractedAddress = extractAddressFromId(user.getId());
|
||||
if (extractedAddress != null)
|
||||
return extractedAddress;
|
||||
|
||||
// try the inference logic
|
||||
String address = MailAddressResolver.resolve(user);
|
||||
if(address!=null)
|
||||
return address;
|
||||
|
||||
if(user.getId().contains("@"))
|
||||
// this already looks like an e-mail ID
|
||||
return user.getId();
|
||||
@@ -387,7 +392,7 @@ public class Mailer extends Publisher {
|
||||
|
||||
public UserProperty newInstance(User user) {
|
||||
|
||||
return new UserProperty(MailAddressResolver.resolve(user));
|
||||
return new UserProperty(null);
|
||||
}
|
||||
|
||||
public UserProperty newInstance(StaplerRequest req) throws FormException {
|
||||
|
||||
Reference in new issue
Block a user