diff --git a/src/categories/data.js b/src/categories/data.js index 452ccf20b8..2b4e029caf 100644 --- a/src/categories/data.js +++ b/src/categories/data.js @@ -73,7 +73,7 @@ module.exports = function (Categories) { Categories.getCategoryField = async function (cid, field) { const category = await Categories.getCategoryFields(cid, [field]); - return category ? category[field] : null; + return category && category.hasOwnProperty(field) ? category[field] : null; }; Categories.getCategoryFields = async function (cid, fields) { diff --git a/src/groups/data.js b/src/groups/data.js index 5ecb9081e0..1dc52e44ad 100644 --- a/src/groups/data.js +++ b/src/groups/data.js @@ -51,7 +51,7 @@ module.exports = function (Groups) { Groups.getGroupField = async function (groupName, field) { const groupData = await Groups.getGroupFields(groupName, [field]); - return groupData ? groupData[field] : null; + return groupData && groupData.hasOwnProperty(field) ? groupData[field] : null; }; Groups.getGroupFields = async function (groupName, fields) { diff --git a/src/messaging/data.js b/src/messaging/data.js index aa96e11a67..2c3257c74f 100644 --- a/src/messaging/data.js +++ b/src/messaging/data.js @@ -29,7 +29,7 @@ module.exports = function (Messaging) { Messaging.getMessageField = async (mid, field) => { const fields = await Messaging.getMessageFields(mid, [field]); - return fields ? fields[field] : null; + return fields && fields.hasOwnProperty(field) ? fields[field] : null; }; Messaging.getMessageFields = async (mid, fields) => { diff --git a/src/posts/data.js b/src/posts/data.js index 5c44b49254..688c131b8a 100644 --- a/src/posts/data.js +++ b/src/posts/data.js @@ -37,7 +37,7 @@ module.exports = function (Posts) { Posts.getPostField = async function (pid, field) { const post = await Posts.getPostFields(pid, [field]); - return post ? post[field] : null; + return post && post.hasOwnProperty(field) ? post[field] : null; }; Posts.getPostFields = async function (pid, fields) { diff --git a/src/topics/data.js b/src/topics/data.js index 1260c092e1..e9a281ecaa 100644 --- a/src/topics/data.js +++ b/src/topics/data.js @@ -40,7 +40,7 @@ module.exports = function (Topics) { Topics.getTopicField = async function (tid, field) { const topic = await Topics.getTopicFields(tid, [field]); - return topic ? topic[field] : null; + return topic && topic.hasOwnProperty(field) ? topic[field] : null; }; Topics.getTopicFields = async function (tid, fields) {