From 2ed876a2e88eda13c0888734083c3c596e92e239 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 20 May 2014 14:51:39 -0500
Subject: [PATCH] thread: Fixup link URLs for emails
This patch adds an 'email' format to ThreadBody::display() which allows
formatting the html/text bodies specifically for email. Previously, there
was ambiguity between the html view (which included inline image support and
clickable links) and the email view, which requires neither.
---
include/class.thread.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/class.thread.php b/include/class.thread.php
index 1d849f426..decd0db5f 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -776,7 +776,7 @@ Class ThreadEntry {
}
function asVar() {
- return (string) $this->getBody()->display('html');
+ return (string) $this->getBody()->display('email');
}
function getVar($tag) {
@@ -1374,6 +1374,9 @@ class TextThreadBody extends ThreadBody {
switch ($output) {
case 'html':
+ return '<div style="white-space:pre-wrap">'
+ .Format::clickableurls($this->body).'</div>';
+ case 'email':
return '<div style="white-space:pre-wrap">'.$this->body.'</div>';
case 'pdf':
return nl2br($this->body);
@@ -1384,7 +1387,7 @@ class TextThreadBody extends ThreadBody {
function asVar() {
// Email template, assume HTML
- return $this->display('html');
+ return $this->display('email');
}
}
class HtmlThreadBody extends ThreadBody {
@@ -1416,6 +1419,8 @@ class HtmlThreadBody extends ThreadBody {
return '(empty)';
switch ($output) {
+ case 'email':
+ return $this->body;
case 'pdf':
return Format::clickableurls($this->body, false);
default:
--
GitLab