From 9a0790ae4cac2167f6db8a680dd305fd86f7110a Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 19 Aug 2015 11:34:53 -0500
Subject: [PATCH] events: Drop 'via' part of collab event if no src
---
include/class.thread.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/class.thread.php b/include/class.thread.php
index 78ba7818b..c1fc3f2a5 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -1864,10 +1864,11 @@ class CollaboratorEvent extends ThreadEvent {
break;
}
}
- $c = sprintf(__("%s via %s"
- /* e.g. "Me <me@company.me> via Email (to)" */),
+ $c = sprintf("%s %s",
Format::htmlchars($U ? $U->getName() : @$c['name'] ?: $c),
- $c['src'] ?: '?'
+ $c['src'] ? sprintf(__('via %s'
+ /* e.g. "Added collab "Me <me@company.me>" via Email (to)" */
+ ), $c['src']) : ''
);
$collabs[] = $c;
}
--
GitLab