From d5f67345f5420056e119754474e1b7225b084843 Mon Sep 17 00:00:00 2001 From: Gregory Luneau Date: Mon, 4 Jan 2016 14:18:12 -0500 Subject: [PATCH] should be conflicts_resolved not conflicts_unresolved table --- .../php/NDB_Menu_Filter_resolved_conflicts.class.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/conflict_resolver/php/NDB_Menu_Filter_resolved_conflicts.class.inc b/modules/conflict_resolver/php/NDB_Menu_Filter_resolved_conflicts.class.inc index 35d6472b073..83e518fc98f 100644 --- a/modules/conflict_resolver/php/NDB_Menu_Filter_resolved_conflicts.class.inc +++ b/modules/conflict_resolver/php/NDB_Menu_Filter_resolved_conflicts.class.inc @@ -100,7 +100,7 @@ class NDB_Menu_Filter_Resolved_Conflicts extends NDB_Menu_Filter array( 'candidate.PSCID', 'session.CandID', - 'conflicts_unresolved.Fieldname', + 'conflicts_resolved.Fieldname', ) ); @@ -138,7 +138,7 @@ class NDB_Menu_Filter_Resolved_Conflicts extends NDB_Menu_Filter array( 'CandID' => 'session.CandID', 'PSCID' => 'candidate.PSCID', - 'Question' => 'conflicts_unresolved.Fieldname', + 'Question' => 'conflicts_resolved.Fieldname', ) ); return true;