From 3f7ae2b612aa6cb7532895c3411fcceb2292c119 Mon Sep 17 00:00:00 2001
From: Daniel Haag <daniel.haag@uibk.ac.at>
Date: Tue, 26 Nov 2019 12:24:03 +0100
Subject: [PATCH] openolat#137: fixed merge variable rename conflict
---
src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java b/src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java
index 23c95dca5e2..1d16eee3edf 100644
--- a/src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java
+++ b/src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java
@@ -95,7 +95,7 @@ public class ErrorFeedbackMailer implements Dispatcher {
Collection<String> logFileEntries = LogFileParser.getErrorToday(errorNr, false);
StringBuilder out = new StringBuilder(2048);
out.append(feedback)
- .append("\n------------------------------------------\n\n --- from user: ").append(identityKey).append(" ---");
+ .append("\n------------------------------------------\n\n --- from user: ").append(username).append(" ---");
if (logFileEntries != null) {
for (Iterator<String> iter = logFileEntries.iterator(); iter.hasNext();) {
out.append(iter.next());
--
GitLab