From a6e106fea01084b0d6aab2d379f21feceb291ce5 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 21 Dec 2005 19:15:45 +0000 Subject: [PATCH] Don't evaluate preset attributes on "duplicate" SVN revision: 1583 --- src/elogd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 6b411e23..6ec85a28 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -8098,7 +8098,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL sprintf(str, "Preset %s", attr_list[index]); if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) { - if ((!bedit && !breply) || /* don't subst on edit or reply */ + if ((!bedit && !breply && !bduplicate) || /* don't subst on edit or reply */ (breedit && i == 2)) { /* subst on reedit only if preset is under condition */ /* do not format date for date attributes */ @@ -8164,7 +8164,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL sprintf(str, "Preset %s", attr_list[index]); if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) { - if ((!bedit && !breply) || /* don't subst on edit or reply */ + if ((!bedit && !breply && !bduplicate) || /* don't subst on edit or reply */ (breedit && i == 2)) { /* subst on reedit only if preset is under condition */ /* do not format date for date attributes */