From f62a933d1c70e93ec5e35494e74c2baf033ee512 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 11 Oct 2019 11:07:48 +0100
Subject: [PATCH] Ensure z property included in full message debug payload
 Fixes #2315 #2316

---
 packages/node_modules/@node-red/nodes/core/common/21-debug.js | 4 ++--
 .../@node-red/nodes/core/common/lib/debug/debug-utils.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.js b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
index 9beff7809..8477ed525 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
@@ -62,7 +62,7 @@ module.exports = function(RED) {
                     if (err) {
                         done(RED._("debug.invalid-exp", {error: editExpression}));
                     } else {
-                        done(null,{id:node.id, name:node.name, topic:msg.topic, msg:value, _path:msg._path});
+                        done(null,{id:node.id, z:node.z, name:node.name, topic:msg.topic, msg:value, _path:msg._path});
                     }
                 });
             } else {
@@ -88,7 +88,7 @@ module.exports = function(RED) {
                     node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
                 }
                 if (this.active && this.tosidebar) {
-                    sendDebug({id:node.id, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
+                    sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
                 }
                 done();
             } else {
diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
index b2d96893c..db1a85510 100644
--- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
+++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
@@ -448,7 +448,7 @@ RED.debug = (function() {
         var metaRow = $('<div class="red-ui-debug-msg-meta"></div>').appendTo(msg);
         $('<span class="red-ui-debug-msg-date">'+ getTimestamp()+'</span>').appendTo(metaRow);
         if (sourceNode) {
-            $('<a>',{href:"#",class:"red-ui-debug-msg-name"}).text('node: '+(sourceNode.name||sourceNode.id))
+            $('<a>',{href:"#",class:"red-ui-debug-msg-name"}).text('node: '+sanitize(o.name||sourceNode.name||sourceNode.id))
             .appendTo(metaRow)
             .on("click", function(evt) {
                 evt.preventDefault();