Skip to content
Snippets Groups Projects
Commit 85b68323 authored by JediKev's avatar JediKev
Browse files

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.
parent e601405e
Branches
Tags
No related merge requests found
...@@ -2248,7 +2248,7 @@ extends VerySimpleModel { ...@@ -2248,7 +2248,7 @@ extends VerySimpleModel {
if ($include_queue && ($q = $this->getQueue()) if ($include_queue && ($q = $this->getQueue())
&& ($q_conds = $q->getConditions()) && ($q_conds = $q->getConditions())
) { ) {
$this->_conditions = array_merge($this->_conditions, $q_conds); $this->_conditions = array_merge($q_conds, $this->_conditions);
} }
} }
return $this->_conditions; return $this->_conditions;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment