From 8d3a1308d80bb9ceb6784ce04b93592d31e8201c Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 9 Jan 2015 11:57:58 -0600
Subject: [PATCH] oops: Fix double processing of ::clickableurls()
---
include/class.thread.php | 9 ++++++---
include/staff/ticket-view.inc.php | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/class.thread.php b/include/class.thread.php
index 6b0df71d4..8564e249a 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -1415,15 +1415,18 @@ class TextThreadBody extends ThreadBody {
if ($this->isEmpty())
return '(empty)';
+ $escaped = Format::htmlchars($this->body);
switch ($output) {
case 'html':
+ return '<div style="white-space:pre-wrap">'
+ .Format::clickableurls($escaped).'</div>';
case 'email':
return '<div style="white-space:pre-wrap">'
- .Format::htmlchars($this->body).'</div>';
+ .$escaped.'</div>';
case 'pdf':
- return nl2br($this->body);
+ return nl2br($escaped);
default:
- return '<pre>'.$this->body.'</pre>';
+ return '<pre>'.$escaped.'</pre>';
}
}
}
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index d19e5e5a9..e3e93f736 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -406,7 +406,7 @@ $tcount+= $ticket->getNumNotes();
</tr>
<tr><td colspan="4" class="thread-body" id="thread-id-<?php
echo $entry['id']; ?>"><div><?php
- echo Format::clickableurls($entry['body']->toHtml()); ?></div></td></tr>
+ echo $entry['body']->toHtml(); ?></div></td></tr>
<?php
if($entry['attachments']
&& ($tentry = $ticket->getThreadEntry($entry['id']))
--
GitLab