Merge pull request #2059 from owncloud/getlog

Add log as text and not as HTML

2 files changed, 3 insertions, 10 deletions

diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index e1fc1689877..141457e72a0 100644
--- 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 04a7bf8b288..09b8ec1ab44 100644
--- 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/>');