diff --git a/include/class.export.php b/include/class.export.php index 85f021328a2d4a0ac7dccc9aa96f3b6738e3d8e1..b30ceb858203be3b9fb38ee1b8c245f8b1756a9d 100644 --- a/include/class.export.php +++ b/include/class.export.php @@ -76,7 +76,7 @@ class Export { ->aggregate(array('count' => SqlAggregate::COUNT('entries__attachments__id'))), 'reopen_count' => TicketThread::objects() ->filter(array('ticket__ticket_id' => new SqlField('ticket_id', 1))) - ->filter(array('events__annulled' => 0, 'events__state' => 'reopened')) + ->filter(array('events__annulled' => 0, 'events__event_id' => Event::getIdByName('reopened'))) ->aggregate(array('count' => SqlAggregate::COUNT('events__id'))), 'thread_count' => TicketThread::objects() ->filter(array('ticket__ticket_id' => new SqlField('ticket_id', 1))) diff --git a/include/class.queue.php b/include/class.queue.php index e3212c502929ddbaa93785eca9f72a9f46007617..6397d34d7fa6d3e28e4635da3264ef4676ed704c 100644 --- a/include/class.queue.php +++ b/include/class.queue.php @@ -1637,7 +1637,7 @@ extends QueueColumnAnnotation { return $query->annotate(array( $name => TicketThread::objects() ->filter(array('ticket__ticket_id' => new SqlField('ticket_id', 1))) - ->filter(array('events__annulled' => 0, 'events__state' => 'reopened')) + ->filter(array('events__annulled' => 0, 'events__event_id' => Event::getIdByName('reopened'))) ->aggregate(array('count' => SqlAggregate::COUNT('events__id'))) )); }