mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2026-09-05 09:38:53 +00:00
Code Issues Releases Wiki Activity

Fixes bug in correctly resolving functions in text substitutions (#9598)

Browse Source 
* fix: correctly resolve functions in text substitutions

* docs: added changenote

* fix: remove commented code
This commit is contained in:
Saq Imtiaz
2026-02-04 11:12:16 +00:00
committed by GitHub
parent 526aaa3db8
commit f6fd5ff261
3 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/modules/wiki.js
+4 -3
View File
@@ -1122,15 +1122,16 @@ Parse a block of text of a specified MIME type
Options include:
substitutions: an optional array of substitutions
*/
exports.getSubstitutedText = function(text,widget,options) {
exports.getSubstitutedText = function(text,thisWidget,options) {
options = options || {};
text = text || "";
var self = this,
widgetClass = widget.widget,
substitutions = options.substitutions || [],
output;
// Evaluate embedded filters and substitute with first result
output = text.replace(/\$\{([\S\s]+?)\}\$/g, function(match,filter) {
return self.filterTiddlers(filter,widget)[0] || "";
return self.filterTiddlers(filter,thisWidget)[0] || "";
});
// Process any substitutions provided in options
$tw.utils.each(substitutions,function(substitute) {
@@ -1138,7 +1139,7 @@ exports.getSubstitutedText = function(text,widget,options) {
});
// Substitute any variable references with their values
return output.replace(/\$\((.+?)\)\$/g, function(match,varname) {
return widget.getVariable(varname,{defaultValue: ""});
return widgetClass.evaluateVariable(thisWidget,varname, {defaultValue: ""})[0];
});
};