From 49ffc9ebfe48b3ded2a67a19abd20f18c247fc71 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 7 Jan 2013 17:41:18 -0500
Subject: [PATCH] Make sure the default SLA is used (if any) on new tickets
created by staff.
---
include/class.ticket.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 5a3fd83f3..3e8134b10 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -720,7 +720,7 @@ class Ticket {
global $cfg;
# XXX Should the SLA be overwritten if it was originally set via an
# email filter? This method doesn't consider such a case
- if ($trump !== null) {
+ if ($trump && is_numeric($trump)) {
$slaId = $trump;
} elseif ($this->getDept() && $this->getDept()->getSLAId()) {
$slaId = $this->getDept()->getSLAId();
@@ -2129,7 +2129,9 @@ class Ticket {
$vars['teamId'] = $topic->getTeamId();
//set default sla.
- if(!isset($vars['slaId']) && $topic->getSLAId())
+ if(isset($vars['slaId']))
+ $vars['slaId'] = $vars['slaId']?$vars['slaId']:$cfg->getDefaultSLAId();
+ elseif($topic && $topic->getSLAId())
$vars['slaId'] = $topic->getSLAId();
}elseif($vars['emailId'] && !$vars['deptId'] && ($email=Email::lookup($vars['emailId']))) { //Emailed Tickets
--
GitLab