From 15e53b8cd1fe4db67389538994ddebe236920655 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Mon, 11 Dec 2023 17:56:11 +0000 Subject: [PATCH] Revert: #7768 Ensure {{}} doesn't cause a recursion error See https://github.com/Jermolene/TiddlyWiki5/pull/7768#issuecomment-1850578638 --- core/modules/parsers/wikiparser/rules/transcludeblock.js | 3 --- core/modules/parsers/wikiparser/rules/transcludeinline.js | 3 --- editions/prerelease/tiddlers/Release 5.3.2.tid | 1 - 3 files changed, 7 deletions(-) diff --git a/core/modules/parsers/wikiparser/rules/transcludeblock.js b/core/modules/parsers/wikiparser/rules/transcludeblock.js index d6dad6df3..c033c2440 100644 --- a/core/modules/parsers/wikiparser/rules/transcludeblock.js +++ b/core/modules/parsers/wikiparser/rules/transcludeblock.js @@ -81,9 +81,6 @@ exports.parse = function() { } return [tiddlerNode]; } else { - // No template or text reference is provided, so we'll use a blank target. Otherwise we'll generate - // a transclude widget that transcludes the current tiddler, often leading to recursion errors - transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: ""}; return [transcludeNode]; } } diff --git a/core/modules/parsers/wikiparser/rules/transcludeinline.js b/core/modules/parsers/wikiparser/rules/transcludeinline.js index 87529ca8d..3ce9dc78e 100644 --- a/core/modules/parsers/wikiparser/rules/transcludeinline.js +++ b/core/modules/parsers/wikiparser/rules/transcludeinline.js @@ -79,9 +79,6 @@ exports.parse = function() { } return [tiddlerNode]; } else { - // No template or text reference is provided, so we'll use a blank target. Otherwise we'll generate - // a transclude widget that transcludes the current tiddler, often leading to recursion errors - transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: ""}; return [transcludeNode]; } } diff --git a/editions/prerelease/tiddlers/Release 5.3.2.tid b/editions/prerelease/tiddlers/Release 5.3.2.tid index 4c7bc8874..c3de75b36 100644 --- a/editions/prerelease/tiddlers/Release 5.3.2.tid +++ b/editions/prerelease/tiddlers/Release 5.3.2.tid @@ -113,7 +113,6 @@ Improvements to the following translations: ! Bug Fixes -* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7665">> `{{}}` generating a recursion error * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7758">> ordering of Vanilla stylesheets * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/fa9bfa07a095548eb2f8339b0b1b816d2e6794ef">> missing closing tag in tag-pill-inner macro * <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/issues/7732">> invalid "type" attribute from textarea elements generated by the EditTextWidget