From a2f3b28b48568c49ac8da22d4a27f50abea8c18a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 22 Jan 2025 01:05:49 -0500
Subject: [PATCH] Remove unnecessary code after ec50539e801

`getBaseIDFromTypeAndField()` now returns the field itself if it's
already a base field
---
 chrome/content/zotero/xpcom/data/item.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index e8472e6cba..3c22814231 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -5323,18 +5323,9 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
 	// https://github.com/zotero/zotero/issues/1504#issuecomment-572415083
 	if (!strict && extraFields.size) {
 		for (let field of setFields.keys()) {
-			let baseField;
-			if (Zotero.ItemFields.isBaseField(field)) {
-				baseField = field;
-			}
-			else {
-				let baseFieldID = Zotero.ItemFields.getBaseIDFromTypeAndField(itemTypeID, field);
-				if (baseFieldID) {
-					baseField = baseFieldID;
-				}
-			}
-			if (baseField) {
-				let mappedFieldNames = Zotero.ItemFields.getTypeFieldsFromBase(baseField, true);
+			let baseFieldID = Zotero.ItemFields.getBaseIDFromTypeAndField(itemTypeID, field);
+			if (baseFieldID) {
+				let mappedFieldNames = Zotero.ItemFields.getTypeFieldsFromBase(baseFieldID, true);
 				for (let mappedField of mappedFieldNames) {
 					if (extraFields.has(mappedField)) {
 						extraFields.delete(mappedField);