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

Allow attribute substitution to handle variables containing non-word characters (#7606)

Browse Source 
* Added failing test for #7604

* Fix attribute substitution regexp

Use the same regexp in wiki.getSubstitutedText as is used in
Widget.prototype.substituteVariableReferences. Fixes #7604.

* Added a test for a variable name containing spaces
This commit is contained in:
btheado
2023-07-14 21:42:31 +01:00
committed by GitHub
parent a7bafd8840
commit 8e9d8d4fef
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/modules/wiki.js
+1 -1
View File
@@ -1086,7 +1086,7 @@ exports.getSubstitutedText = function(text,widget,options) {
output = $tw.utils.replaceString(output,new RegExp("\\$" + $tw.utils.escapeRegExp(substitute.name) + "\\$","mg"),substitute.value);
});
// Substitute any variable references with their values
return output.replace(/\$\((\w+)\)\$/g, function(match,varname) {
return output.replace(/\$\(([^\)\$]+)\)\$/g, function(match,varname) {
return widget.getVariable(varname,{defaultValue: ""})
});
};