From a9d7c67bf2e906fceea40b41f4780e623226fdff Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 10 May 2012 09:13:09 +0200
Subject: [PATCH] The log message is not always shown in html
The log message can also be logged with syslog, here we don't want to have html-entities. Also the log messages through json are displayed as text not html.
---
lib/log.php | 2 +-
settings/templates/admin.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/log.php b/lib/log.php
index bccc46846ce..8bb2839be66 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -34,6 +34,6 @@ class OC_Log {
call_user_func(array(self::$class, 'init'));
}
$log_class=self::$class;
- $log_class::write($app, htmlentities($message), $level);
+ $log_class::write($app, $message, $level);
}
}
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 38c6042c82a..d167f2780ef 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,7 +29,7 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
<?php echo $entry->app;?>
</td>
<td>
- <?php echo $entry->message;?>
+ <?php echo htmlentities($entry->message);?>
</td>
<td>
<?php echo OC_Util::formatDate($entry->time);?>
--
GitLab