From 6f35a875626c491953796fd3e9fd6109f46d5844 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Mon, 22 Apr 2019 23:22:35 +0000
Subject: [PATCH] Ticket Link: Always return a link
---
include/class.client.php | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/include/class.client.php b/include/class.client.php
index 2d1f2930c..d58f15315 100644
--- a/include/class.client.php
+++ b/include/class.client.php
@@ -58,25 +58,21 @@ implements EmailContact, ITicketUser, TemplateVariable {
switch (strtolower($tag)) {
case 'ticket_link':
$qstr = array();
+ $ticket = $this->getTicket();
if ($cfg && $cfg->isAuthTokenEnabled()
- && ($ticket=$this->getTicket())) {
- if (!$ticket->getThread()->getNumCollaborators()) {
- $qstr['auth'] = $ticket->getAuthToken($this);
- return sprintf('%s/view.php?%s',
- $cfg->getBaseUrl(),
- Http::build_query($qstr, false)
- );
- }
- else {
- return sprintf('%s/tickets.php?id=%s',
- $cfg->getBaseUrl(),
- $ticket->getId()
- );
- }
- }
-
-
-
+ && $ticket
+ && !$ticket->getNumCollaborators()) {
+ $qstr['auth'] = $ticket->getAuthToken($this);
+ return sprintf('%s/view.php?%s',
+ $cfg->getBaseUrl(),
+ Http::build_query($qstr, false)
+ );
+ } else {
+ return sprintf('%s/tickets.php?id=%s',
+ $cfg->getBaseUrl(),
+ $ticket ? $ticket->getId() : 0
+ );
+ }
break;
}
}
--
GitLab