From 1994a485146af033a55b8467f6b88cd44d3897ff Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 1 Apr 2016 19:07:14 -0500
Subject: [PATCH] queue: Fixup after rebase (squashme)
---
include/class.ticket.php | 2 +-
include/staff/ticket-view.inc.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 417e7be77..7cbc22ce9 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -3696,7 +3696,7 @@ extends VerySimpleModel {
'pk' => array('ticket_id'),
'joins' => array(
'ticket' => array(
- 'constraint' => array('ticket_id' => 'TicketModel.ticket_id'),
+ 'constraint' => array('ticket_id' => 'Ticket.ticket_id'),
),
)
);
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index eb4dee649..675e99642 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -206,7 +206,7 @@ if($ticket->isOverdue())
</ul>
</div>
<?php
- if ($role->hasPerm(TicketModel::PERM_REPLY)) { ?>
+ if ($role->hasPerm(Ticket::PERM_REPLY)) { ?>
<a href="#post-reply" class="post-response action-button"
data-placement="bottom" data-toggle="tooltip"
title="<?php echo __('Post Reply'); ?>"><i class="icon-mail-reply"></i></a>
--
GitLab