From 45f0f46fdf5ebc5cea029e86a4c78dd682458e4c Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 31 Oct 2013 21:59:37 +0000 Subject: [PATCH] Fix macrocall widget to not pass $name as a parameter --- core/modules/new_widgets/macrocall.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/modules/new_widgets/macrocall.js b/core/modules/new_widgets/macrocall.js index a488917e0..5b13197d8 100644 --- a/core/modules/new_widgets/macrocall.js +++ b/core/modules/new_widgets/macrocall.js @@ -40,7 +40,9 @@ MacroCallWidget.prototype.execute = function() { // Merge together the parameters specified in the parse tree with the specified attributes var params = this.parseTreeNode.params ? this.parseTreeNode.params.slice(0) : []; $tw.utils.each(this.attributes,function(attribute,name) { - params.push({name: name, value: attribute}); + if(name !== "$name") { + params.push({name: name, value: attribute}); + } }); // Get the macro value var text = this.getVariable(this.parseTreeNode.name || this.getAttribute("$name"),{params: params});