From 68163684a2e57108e160295e445c194268b873c5 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Wed, 11 Sep 2019 11:40:45 +0100
Subject: [PATCH] Fix publishFilter in save templates

Fixes #4252
---
 core/templates/external-js/save-all-external-js.tid | 1 +
 core/templates/save-all.tid                         | 1 +
 plugins/tiddlywiki/tiddlyweb/save-offline.tid       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid
index 31476e663..8eff8b9e6 100644
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -1,5 +1,6 @@
 title: $:/core/save/all-external-js
 
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid
index 52ef0fb2c..d622f9c52 100644
--- a/core/templates/save-all.tid
+++ b/core/templates/save-all.tid
@@ -1,5 +1,6 @@
 title: $:/core/save/all
 
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
diff --git a/plugins/tiddlywiki/tiddlyweb/save-offline.tid b/plugins/tiddlywiki/tiddlyweb/save-offline.tid
index 0cc4d55cc..b2bfdbdd1 100644
--- a/plugins/tiddlywiki/tiddlyweb/save-offline.tid
+++ b/plugins/tiddlywiki/tiddlyweb/save-offline.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/tiddlyweb/save/offline
 
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[[$:/boot/boot.css]] -[[$:/HistoryList]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] +[sort[title]] $(publishFilter)$
 \end