From f26bcb273bd8456d4cca31bbf0cb55a14f2ec958 Mon Sep 17 00:00:00 2001
From: Tobias Beer <beertobias@gmail.com>
Date: Tue, 24 Apr 2018 23:03:59 +0200
Subject: [PATCH] Fix new field value handling in edit template (#3048)

prevents variables in the value from being replaced when adding a new field
---
 core/ui/EditTemplate/fields.tid | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 86de3a37d..31339733d 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -10,10 +10,13 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 [[hide]] -[title{$(config-title)$}]
 \end
 
-\define new-field-inner()
+\define new-field()
+<$vars name={{$:/temp/newfieldname}}>
 <$reveal type="nomatch" text="" default=<<name>>>
 <$button>
-<$action-sendmessage $message="tm-add-field" $name=<<name>> $value=<<value>>/>
+<$action-sendmessage $message="tm-add-field"
+$name=<<name>>
+$value={{$:/temp/newfieldvalue}}/>
 <$action-deletetiddler $tiddler="$:/temp/newfieldname"/>
 <$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/>
 <<lingo Fields/Add/Button>>
@@ -24,14 +27,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <<lingo Fields/Add/Button>>
 </$button>
 </$reveal>
-\end
-
-\define new-field()
-<$set name="name" value={{$:/temp/newfieldname}}>
-<$set name="value" value={{$:/temp/newfieldvalue}}>
-<<new-field-inner>>
-</$set>
-</$set>
+</$vars>
 \end
 
 <div class="tc-edit-fields">