Skip to content
Snippets Groups Projects
Commit 70401ea0 authored by Jared Hancock's avatar Jared Hancock
Browse files

Merge pull request #605 from protich/issue/collabs-notice-signature


Expose staff's signature as a variable in collaborator's template

Reviewed-By: default avatarJared Hancock <jared@osticket.com>
parents 0c4c2af1 56f55d2d
No related branches found
No related tags found
No related merge requests found
......@@ -979,7 +979,7 @@ class Ticket {
*
*/
function notifyCollaborators($entry) {
function notifyCollaborators($entry, $vars = array()) {
global $cfg;
if (!$entry instanceof ThreadEntry
......@@ -1002,9 +1002,11 @@ class Ticket {
$uid = $this->getUserId();
}
$vars = array(
'message' => (string) $entry,
'poster' => $poster? $poster : 'A collaborator');
$vars = array_merge($vars, array(
'message' => (string) $entry,
'poster' => $poster? $poster : 'A collaborator',
)
);
$msg = $this->replaceVars($msg->asArray(), $vars);
......@@ -1601,7 +1603,7 @@ class Ticket {
}
}
$this->notifyCollaborators($message);
$this->notifyCollaborators($message, array('signature' => ''));
return $message;
}
......@@ -1717,7 +1719,8 @@ class Ticket {
}
if($vars['emailcollab'])
$this->notifyCollaborators($response);
$this->notifyCollaborators($response,
array('signature' => $signature));
return $response;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment