Add log as text and not as HTML

diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index e1fc16898773b0eca85ae44f3740f2a32e152726..141457e72a0ad1bf4ec7eaefa5f1ba27f8515d7b 100644 (file)
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -12,14 +12,7 @@ $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count, $offset);
 $data = array();
-foreach($entries as $entry) {
-       $data[] = array(
-               'level' => OC_Util::sanitizeHTML($entry->level),
-               'app' => OC_Util::sanitizeHTML($entry->app),
-               'message' => OC_Util::sanitizeHTML($entry->message),
-               'time' => OC_Util::sanitizeHTML($entry->time),
-       );
-}
+
 OC_JSON::success(array(
-       "data" => $data,
+       "data" => $entries,
        "remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));

diff --git a/settings/js/log.js b/settings/js/log.js
index 04a7bf8b2881fff567920181c02563596d9434ec..09b8ec1ab4498a9f67e398929918803214a40ee5 100644 (file)
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -42,7 +42,7 @@ OC.Log={
                        row.append(appTd);
                        
                        var messageTd=$('<td/>');
-                       messageTd.html(entry.message);
+                       messageTd.text(entry.message);
                        row.append(messageTd);
                        
                        var timeTd=$('<td/>');