From 4530eaf24ad606f77f399d3bf0f196123aa0ad6e Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Mon, 15 Oct 2012 19:03:05 +0100
Subject: [PATCH] Update transclude parser rule to use the tiddler macro for
 single tiddlers

---
 .../parsers/newwikitextparser/rules/transclude.js      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/modules/parsers/newwikitextparser/rules/transclude.js b/core/modules/parsers/newwikitextparser/rules/transclude.js
index b39446541..75927dc25 100644
--- a/core/modules/parsers/newwikitextparser/rules/transclude.js
+++ b/core/modules/parsers/newwikitextparser/rules/transclude.js
@@ -34,21 +34,23 @@ exports.parse = function(match,isBlock) {
 	match = regExp.exec(this.source);
 	if(match && match.index === this.pos) {
 		this.pos = match.index + match[0].length;
-		var params = {};
+		var macro, params = {};
 		// Check if it is a single tiddler
 		if(match[1]) {
-			params.title = match[1];
+			macro = "tiddler";
+			params.target = match[1];
 		} else {
 			// Else it is a filter
+			macro = "transclude";
 			params.filter = match[2];
 		}
 		if(match[3]) {
-			params.templateTitle = match[3];
+			params.template = match[3];
 		}
 		if(match[4]) {
 			params.templateText = match[4];
 		}
-		return [$tw.Tree.Macro("transclude",{
+		return [$tw.Tree.Macro(macro,{
 			srcParams: params,
 			wiki: this.wiki
 		})];