Merge branch 'discover-pixel' into v1.2-next

This commit is contained in:
AJ ONeal 2017-11-24 01:28:23 +00:00
commit 77c64df163
1 changed files with 2 additions and 2 deletions

View File

@ -1300,10 +1300,10 @@
// The username may have a single @, the provider may not // The username may have a single @, the provider may not
// user@thing.com@whatever.com -> user@thing.com, whatever.com // user@thing.com@whatever.com -> user@thing.com, whatever.com
issuer = parts.pop(); issuer = parts.pop();
subject = parts.join(''); subject = parts.join('@');
} else { } else {
//subject = ''; //subject = '';
issuer = parts.join(''); issuer = parts.join('@');
} }
return { subject: subject, issuer: issuer }; return { subject: subject, issuer: issuer };