mirror of
https://github.com/nodemailer/wildduck.git
synced 2025-09-12 08:04:37 +08:00
v1.1.0
This commit is contained in:
parent
2510495ecf
commit
d8ee6530e3
2 changed files with 2 additions and 2 deletions
|
@ -440,7 +440,7 @@ class TokenParser {
|
||||||
throw new Error('Unexpected whitespace at position ' + (this.pos + i));
|
throw new Error('Unexpected whitespace at position ' + (this.pos + i));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.currentNode.value.substr(-1) === '*' && this.currentNode.value.substr(-2, 1) !== ':') {
|
if (this.currentNode.value !== '*' && this.currentNode.value.substr(-1) === '*' && this.currentNode.value.substr(-2, 1) !== ':') {
|
||||||
throw new Error('Unexpected whitespace at position ' + (this.pos + i));
|
throw new Error('Unexpected whitespace at position ' + (this.pos + i));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -276,7 +276,7 @@ function getEmailTemplates(tags, callback) {
|
||||||
|
|
||||||
return entry.message;
|
return entry.message;
|
||||||
})
|
})
|
||||||
.filter(entry => entry);
|
.filter(entry => entry && !entry.disabled);
|
||||||
|
|
||||||
templates = newTemplates;
|
templates = newTemplates;
|
||||||
return callback(null, templates.map(template => renderEmailTemplate(tags, template)));
|
return callback(null, templates.map(template => renderEmailTemplate(tags, template)));
|
||||||
|
|
Loading…
Add table
Reference in a new issue