From 68dd3686b77a53c22bef7a7c560e1de2367c33d6 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Wed, 13 Nov 2013 15:02:22 +0000
Subject: [PATCH] Make backtrace logs well formated and preserve white spaces
on display.
---
include/ajax.content.php | 4 +++-
include/class.osticket.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/ajax.content.php b/include/ajax.content.php
index 2451880ac..d48468239 100644
--- a/include/ajax.content.php
+++ b/include/ajax.content.php
@@ -21,7 +21,9 @@ class ContentAjaxAPI extends AjaxController {
function log($id) {
if($id && ($log=Log::lookup($id))) {
- $content=sprintf('<div style="width:500px;"> <strong>%s</strong><br><p>%s</p>
+ $content=sprintf('<div
+ style="width:500px;"> <strong>%s</strong><br><p
+ style="white-space:pre-line;">%s</p>
<hr><strong>Log Date:</strong> <em>%s</em> <strong>IP Address:</strong> <em>%s</em></div>',
$log->getTitle(),
Format::display(str_replace(',',', ',$log->getText())),
diff --git a/include/class.osticket.php b/include/class.osticket.php
index 839d36e4b..875dc13bf 100644
--- a/include/class.osticket.php
+++ b/include/class.osticket.php
@@ -271,7 +271,7 @@ class osTicket {
$e = new Exception();
$bt = str_replace(ROOT_DIR, '(root)/', $e->getTraceAsString());
- $error .= "\n\n---- Backtrace ----\n".$bt;
+ $error .= nl2br("\n\n---- Backtrace ----\n".$bt);
return $this->log(LOG_ERR, $title, $error, $alert);
}
--
GitLab