From b95f9e6000bffb563e06d644d76a34abd87f131a Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Tue, 17 Nov 2020 20:08:14 +0100
Subject: [PATCH] Partial fix for issue #4721 (#5060)

* Update new-tiddler.tid

* Update new-journal.tid

* Update new-image.tid
---
 core/ui/Actions/new-image.tid   | 5 +++--
 core/ui/Actions/new-journal.tid | 7 ++++---
 core/ui/Actions/new-tiddler.tid | 5 ++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/ui/Actions/new-image.tid b/core/ui/Actions/new-image.tid
index d27d5c8c1..fc7316235 100644
--- a/core/ui/Actions/new-image.tid
+++ b/core/ui/Actions/new-image.tid
@@ -5,6 +5,7 @@ description: create a new image tiddler
 \define get-type()
 image/$(imageType)$
 \end
-<$vars imageType={{$:/config/NewImageType}}>
-<$action-sendmessage $message="tm-new-tiddler" type=<<get-type>> tags={{$:/config/NewTiddler/Tags}}/>
+\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
+<$vars imageType={{$:/config/NewImageType}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}}>
+<$action-sendmessage $message="tm-new-tiddler" type=<<get-type>> tags=<<get-tags>>/>
 </$vars>
diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid
index 4c5082f78..b5d1fe09f 100644
--- a/core/ui/Actions/new-journal.tid
+++ b/core/ui/Actions/new-journal.tid
@@ -2,13 +2,14 @@ title: $:/core/ui/Actions/new-journal
 tags: $:/tags/Actions
 description: create a new journal tiddler
 
-<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} journalText={{$:/config/NewJournal/Text}}>
+\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
+<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
 <$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
 <$reveal type="nomatch" state=<<journalTitle>> text="">
-<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text={{{ [<journalTitle>get[]] }}}/>
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text={{{ [<journalTitle>get[]] }}}/>
 </$reveal>
 <$reveal type="match" state=<<journalTitle>> text="">
-<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text=<<journalText>>/>
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text=<<journalText>>/>
 </$reveal>
 </$wikify>
 </$vars>
diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid
index 4a6eeac7b..c919a109e 100644
--- a/core/ui/Actions/new-tiddler.tid
+++ b/core/ui/Actions/new-tiddler.tid
@@ -2,4 +2,7 @@ title: $:/core/ui/Actions/new-tiddler
 tags: $:/tags/Actions
 description: create a new empty tiddler
 
-<$action-sendmessage $message="tm-new-tiddler" tags={{$:/config/NewTiddler/Tags}}/>
+\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
+<$vars textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}>
+<$action-sendmessage $message="tm-new-tiddler" tags=<<get-tags>>/>
+</$vars>