From 6c69cdf860b198d8953f6532d0363945370ddafd Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 8 Jun 2016 10:41:30 +0200
Subject: [PATCH] Add user ID to log entries in admin page

---
 settings/js/log.js           | 5 +++++
 settings/templates/admin.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/settings/js/log.js b/settings/js/log.js
index 43ef561f7e..a1ad29d72e 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -64,6 +64,11 @@ OC.Log = {
 				timeTd.text(formatDate(entry.time * 1000));
 			}
 			row.append(timeTd);
+
+			var userTd = $('<td/>');
+			userTd.text(entry.user);
+			row.append(userTd);
+
 			$('#log').append(row);
 		}
 		OC.Log.loaded += entries.length;
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 616ac2ab85..c19b289bbd 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -519,6 +519,7 @@ if ($_['cronErrors']) {
 					p($entry->time);
 				}?>
 			</td>
+			<td><?php isset($entry->user) ? p($entry->user) : p('--') ?></td>
 		</tr>
 		<?php endforeach;?>
 	</table>