From 85b68323d04ec22ba1bc91cbc896f04c5deff745 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Tue, 14 Aug 2018 11:44:00 -0500
Subject: [PATCH] queues: Column Conditions Overwrite
This addresses an issue where Column Conditions are not overwriting the Row
Conditions. This changes the order of `array_merge()` to make Column
Conditions overwrite the Row Conditions.
---
include/class.queue.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/class.queue.php b/include/class.queue.php
index 87f2850ef..46953fc83 100644
--- a/include/class.queue.php
+++ b/include/class.queue.php
@@ -2248,7 +2248,7 @@ extends VerySimpleModel {
if ($include_queue && ($q = $this->getQueue())
&& ($q_conds = $q->getConditions())
) {
- $this->_conditions = array_merge($this->_conditions, $q_conds);
+ $this->_conditions = array_merge($q_conds, $this->_conditions);
}
}
return $this->_conditions;
--
GitLab