www

commit 3415aae908cd334d2a5c76fc451505495f443056
parent 50b7dd39a036615236661135bb635e83e8d44f18
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 24 Jan 2017 15:42:28 -0500

Fix error generating reports

9b247ebba7c follow-up

Diffstat:
M
chrome/content/zotero/xpcom/data/search.js
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/data/search.js b/chrome/content/zotero/xpcom/data/search.js
@@ -935,7 +935,8 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
 			// For conditions with an inline filter using 'is'/'isNot', combine with last condition
 			// if the same
 			if (lastCondition
-					&& (!lastCondition.alias || name == lastCondition.alias)
+					&& ((!lastCondition.alias && !condition.alias && name == lastCondition.name)
+						|| (lastCondition.alias && condition.alias && lastCondition.alias == condition.alias))
 					&& condition.operator.startsWith('is')
 					&& condition.operator == lastCondition.operator
 					&& conditionData.inlineFilter) {