diff -Nur osticket_1.6.rc2/upload/include/class.ticket.php osticket_1.6.rc2-patch9/upload/include/class.ticket.php --- osticket_1.6.rc2/upload/include/class.ticket.php 2008-01-01 04:40:46.000000000 +0100 +++ osticket_1.6.rc2-patch9/upload/include/class.ticket.php 2008-01-24 13:53:05.000000000 +0100 @@ -420,6 +420,7 @@ if(db_num_rows($resp) && list($subj,$body)=db_fetch_row($resp)){ $subj = str_replace("%ticket", $this->getExtId(),$subj); $body = str_replace("%ticket", $this->getExtId(),$body); + $body = str_replace("%subject", $this->getSubject(),$body); $body = str_replace("%assignee", $staff->getName(),$body); $body = str_replace("%assigner", $thisuser->getName(),$body); $body = str_replace("%message", $message,$body); @@ -488,6 +489,7 @@ $subj = str_replace("%ticket", $this->getExtId(),$subj); $body = str_replace("%ticket", $this->getExtId(),$body); + $body = str_replace("%subject", $this->getSubject(),$body); $body = str_replace("%name", $this->getName(),$body); $body = str_replace("%email", $this->getEmail(),$body); $body = str_replace("%url", $cfg->getBaseUrl(),$body); @@ -517,6 +519,7 @@ $resp=db_query($sql); if($resp && list($subj,$body)=db_fetch_row($resp)){ $body = str_replace("%ticket", $this->getExtId(),$body); + $body = str_replace("%subject", $this->getSubject(),$body); $body = str_replace("%name", $this->getName(),$body); $body = str_replace("%email", $this->getEmail(),$body); $body = str_replace("%dept", $dept->getName(),$body); @@ -956,6 +959,7 @@ $subj = str_replace("%ticket", $ticket->getExtId(),$subj); $body = str_replace("%ticket", $ticket->getExtId(),$body); + $body = str_replace("%subject", $ticket->getSubject(),$body); $body = str_replace("%name", $ticket->getName(),$body); $body = str_replace("%email", $ticket->getEmail(),$body); $body = str_replace("%url", $cfg->getBaseUrl(),$body); @@ -985,6 +989,7 @@ $resp=db_query($sql); if($resp && list($subj,$body)=db_fetch_row($resp)){ $body = str_replace("%ticket", $ticket->getExtId(),$body); + $body = str_replace("%subject", $ticket->getSubject(),$body); $body = str_replace("%name", $ticket->getName(),$body); $body = str_replace("%email", $ticket->getEmail(),$body); $body = str_replace("%dept", $dept?$dept->getName():'',$body);