diff --git a/core/modules/widgets/image.js b/core/modules/widgets/image.js
index c56726609..47618aad8 100644
--- a/core/modules/widgets/image.js
+++ b/core/modules/widgets/image.js
@@ -52,7 +52,7 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 		tiddler = this.wiki.getTiddler(this.imageSource);
 	if(!tiddler) {
 		// The source isn't the title of a tiddler, so we'll assume it's a URL
-		src = this.getVariable("tv-get-export-image-link") || this.imageSource;
+		src = this.getVariable("tv-get-export-image-link",{params: [{name: "src",value: this.imageSource}],defaultValue: this.imageSource}) || this.imageSource;
 	} else {
 		// Check if it is an image tiddler
 		if(this.wiki.isImageTiddler(this.imageSource)) {
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index 0088d5134..36ee98fa2 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -76,7 +76,7 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 	var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"),
 		wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$",
 		wikiLinkText = wikiLinkTemplate.replace("$uri_encoded$",encodeURIComponent(this.to));
-	wikiLinkText = this.getVariable("tv-get-export-link") || wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
+	wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: this.to}) || wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
 	domNode.setAttribute("href",wikiLinkText);
 	// Set the tooltip
 	// HACK: Performance issues with re-parsing the tooltip prevent us defaulting the tooltip to "<$transclude field='tooltip'><$transclude field='title'/></$transclude>"