From 3bdc18ab8409d145790ada3de5e3f381ce4c6625 Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Fri, 30 Dec 2022 15:28:34 +0000
Subject: [PATCH] Fix json operators retrieving properties of strings and
 numbers

Fixes #7160
---
 core/modules/filters/json-ops.js                  | 6 +++++-
 editions/test/tiddlers/tests/test-json-filters.js | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/modules/filters/json-ops.js b/core/modules/filters/json-ops.js
index eabf6433e..2be9ec754 100644
--- a/core/modules/filters/json-ops.js
+++ b/core/modules/filters/json-ops.js
@@ -176,7 +176,11 @@ function getDataItem(data,indexes) {
 	var item = data;
 	for(var i=0; i<indexes.length; i++) {
 		if(item !== undefined) {
-			item = item[indexes[i]];
+			if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
+				item = item[indexes[i]];
+			} else {
+				item = undefined;
+			}
 		}
 	}
 	return item;
diff --git a/editions/test/tiddlers/tests/test-json-filters.js b/editions/test/tiddlers/tests/test-json-filters.js
index b7f4836d9..68a82e774 100644
--- a/editions/test/tiddlers/tests/test-json-filters.js
+++ b/editions/test/tiddlers/tests/test-json-filters.js
@@ -41,7 +41,9 @@ describe("json filter tests", function() {
 		expect(wiki.filterTiddlers("[{Second}jsonget[]]")).toEqual(["une","deux","trois","quatre","cinq"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[]]")).toEqual(["one","","1.618","four","five","six","true","false","null"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[a]]")).toEqual(["one"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[a],[fixed]]")).toEqual([]);
 		expect(wiki.filterTiddlers("[{First}jsonget[b]]")).toEqual([""]);
+		expect(wiki.filterTiddlers("[{First}jsonget[c]]")).toEqual(["1.618"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[missing-property]]")).toEqual([]);
 		expect(wiki.filterTiddlers("[{First}jsonget[d]]")).toEqual(["four","five","six","true","false","null"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[d],[e]]")).toEqual(["four"]);