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.

diff --git a/lib/log.php b/lib/log.php
index bccc46846cea07e9407725929d6577689b91225c..8bb2839be66a36686539348fbfb913bbd16c361e 100644 (file)
--- 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 38c6042c82ae68fa5022b0c6d75d3a4a452a7241..d167f2780ef310e335cf0c45b2e584f728249cc4 100644 (file)
--- 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);?>