Module: check_mk
Branch: master
Commit: 2cb867245d1ffbb702f4d86d10e717cd7f8a5e58
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cb867245d1ffb…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 30 08:56:37 2013 +0200
FIX: HTML mails: remove undefinded placeholders like $GRAPH_CODE$
---
ChangeLog | 1 +
notifications/mail | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index d260bdc..24fa977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,7 @@
Notifications:
* FIX: HTML mails: Handle the case where plugin argument is not set
+ * FIX: HTML mails: remove undefinded placeholders like $GRAPH_CODE$
WATO:
* Improved handling of valuespec validations in WATO rule editor. Displaying a
diff --git a/notifications/mail b/notifications/mail
index 223e794..a96f434 100755
--- a/notifications/mail
+++ b/notifications/mail
@@ -263,7 +263,7 @@ def substitute_context(template, context):
template = template.replace('$'+varname+'$', value)
# Remove the rest of the variables and make them empty
- template = re.sub("\$[A-Z]+\$", "", template)
+ template = re.sub("\$[A-Z_][A-Z_0-9]*\$", "", template)
return template
def prepare_contents(context):