diff --git a/include/class.report.php b/include/class.report.php index 5e1ac94b97f52c3c8b5f5efb50ffa06e841c3737..c39ec47cc5ea595aaddcaf46d25323929d58c1cc 100644 --- a/include/class.report.php +++ b/include/class.report.php @@ -211,7 +211,7 @@ class OverviewReport { $headers = array(__('Help Topic')); $header = function($row) { return Topic::getLocalNameById($row['topic_id'], $row['topic__topic']); }; $pk = 'topic_id'; - $topics = Topic::getHelpTopics(); + $topics = Topic::getHelpTopics(false, Topic::DISPLAY_DISABLED); $stats = $stats ->values('topic_id', 'topic__topic', 'topic__flags') ->filter(array('dept_id__in' => $thisstaff->getDepts(), 'topic_id__gt' => 0, 'topic_id__in' => array_keys($topics))); diff --git a/include/class.ticket.php b/include/class.ticket.php index a1147c2cbb29115766bfe4279cc9d98aef31c97f..cdf4f22e01a8cdd0ee07d37e2193c94b14c10066 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -207,9 +207,8 @@ implements RestrictedAccess, Threadable, Searchable { } function isReopenable() { - return ($this->getStatus()->isReopenable() - && $this->getDept()->allowsReopen() - && $this->getTopic()->allowsReopen()); + return ($this->getStatus()->isReopenable() && $this->getDept()->allowsReopen() + && ($this->getTopic() ? $this->getTopic()->allowsReopen() : null)); } function isClosed() { @@ -968,7 +967,7 @@ implements RestrictedAccess, Threadable, Searchable { 'name' => "{$fid}_id", 'label' => __('Help Topic'), 'default' => $this->getTopicId(), - 'choices' => Topic::getHelpTopics() + 'choices' => Topic::getHelpTopics(false, Topic::DISPLAY_DISABLED) )); break; case 'source':