Fix setvar to understand Rule variable in collections

Issue #1961
This commit is contained in:
Felipe Zimmerle
2018-11-26 19:48:02 -03:00
parent cbf2fe9703
commit e712d30c56
2 changed files with 8 additions and 6 deletions

View File

@@ -65,17 +65,17 @@ bool SetVar::evaluate(Rule *rule, Transaction *t) {
Variables::User_DynamicElement *user = dynamic_cast<
Variables::User_DynamicElement *> (v);
if (tx) {
m_variableNameExpanded = tx->m_string->evaluate(t);
m_variableNameExpanded = tx->m_string->evaluate(t, rule);
} else if (session) {
m_variableNameExpanded = session->m_string->evaluate(t);
m_variableNameExpanded = session->m_string->evaluate(t, rule);
} else if (ip) {
m_variableNameExpanded = ip->m_string->evaluate(t);
m_variableNameExpanded = ip->m_string->evaluate(t, rule);
} else if (resource) {
m_variableNameExpanded = resource->m_string->evaluate(t);
m_variableNameExpanded = resource->m_string->evaluate(t, rule);
} else if (global) {
m_variableNameExpanded = global->m_string->evaluate(t);
m_variableNameExpanded = global->m_string->evaluate(t, rule);
} else if (user) {
m_variableNameExpanded = user->m_string->evaluate(t);
m_variableNameExpanded = user->m_string->evaluate(t, rule);
} else {
m_variableNameExpanded = m_variable->m_name;
}