111

skadefro · skadefro · commit 321b0df1e1e6 · 2020-06-30T09:17:20.000+02:00
diff --git a/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts b/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts
@@ -177,10 +177,10 @@ export class workflow_in_node {
                     data = orgmsg;
                 } else {
                     if (typeof orgmsg.payload === "object") {
-                        orgmsg.payload = Object.assign(orgmsg.payload, data);
+                        orgmsg.payload = Object.assign(orgmsg.payload, data.payload);
                     } else {
                         orgmsg.payload = { message: orgmsg.payload };
-                        orgmsg.payload = Object.assign(orgmsg.payload, data);
+                        orgmsg.payload = Object.assign(orgmsg.payload, data.payload);
                     }
                     data = orgmsg;
                 }
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.13
+1.0.14

Original file line number	Diff line number	Diff line change
`@@ -177,10 +177,10 @@ export class workflow_in_node {`
`177`	`177`	`data = orgmsg;`
`178`	`178`	`} else {`
`179`	`179`	`if (typeof orgmsg.payload === "object") {`
`180`		`- orgmsg.payload = Object.assign(orgmsg.payload, data);`
	`180`	`+ orgmsg.payload = Object.assign(orgmsg.payload, data.payload);`
`181`	`181`	`} else {`
`182`	`182`	`orgmsg.payload = { message: orgmsg.payload };`
`183`		`- orgmsg.payload = Object.assign(orgmsg.payload, data);`
	`183`	`+ orgmsg.payload = Object.assign(orgmsg.payload, data.payload);`
`184`	`184`	`}`
`185`	`185`	`data = orgmsg;`
`186`	`186`	`}`