From 9057d48273778159d45cb7fabc5054361886204e Mon Sep 17 00:00:00 2001 From: f0o Date: Sun, 30 Aug 2015 17:07:02 +0100 Subject: [PATCH] Fix default template assignment --- alerts.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alerts.php b/alerts.php index b23f96fa02..eb63a8ad5e 100755 --- a/alerts.php +++ b/alerts.php @@ -343,7 +343,8 @@ function ExtTransports($obj) { * @return string */ function FormatAlertTpl($obj) { - $msg = '$ret .= "'.str_replace(array('{else}', '{/if}', '{/foreach}'), array('"; } else { $ret .= "', '"; } $ret .= "', '"; } $ret .= "'), addslashes($obj["template"])).'";'; + $tpl = $obj["template"]; + $msg = '$ret .= "'.str_replace(array('{else}', '{/if}', '{/foreach}'), array('"; } else { $ret .= "', '"; } $ret .= "', '"; } $ret .= "'), addslashes($tpl)).'";'; $parsed = $msg; $s = strlen($msg); $x = $pos = -1; @@ -421,7 +422,9 @@ function DescribeAlert($alert) { $obj['device_id'] = $alert['device_id']; $extra = $alert['details']; if (!isset($tpl['template'])) { - $tpl['template'] = $default_tpl; + $obj['template'] = $default_tpl; + } else { + $obj['template'] = $tpl['template']; } if ($alert['state'] >= 1) { if (!empty($tpl['title'])) {