From b49e27cd288827a68c0018fd75b0c5c6bfb5ad43 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 16 Sep 2013 13:58:25 +0200
Subject: [PATCH] OO-772: check null before building the footer
---
src/main/java/org/olat/core/util/mail/MailHelper.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/core/util/mail/MailHelper.java b/src/main/java/org/olat/core/util/mail/MailHelper.java
index cb000ccaa92..14974c39dff 100644
--- a/src/main/java/org/olat/core/util/mail/MailHelper.java
+++ b/src/main/java/org/olat/core/util/mail/MailHelper.java
@@ -38,7 +38,6 @@ import org.olat.core.helpers.Settings;
import org.olat.core.id.Identity;
import org.olat.core.id.User;
import org.olat.core.id.UserConstants;
-import org.olat.core.util.ArrayHelper;
import org.olat.core.util.Util;
import org.olat.core.util.i18n.I18nModule;
import org.olat.user.UserManager;
@@ -94,9 +93,13 @@ public class MailHelper {
uProps.add("");
}
- String[] userProps = new String[]{};
- userProps = ArrayHelper.toArray(uProps);
- return trans.translate("footer.with.userdata", userProps);
+ String[] userPropArr = uProps.toArray(new String[uProps.size()]);
+ for(int i=userPropArr.length; i-->0; ) {
+ if(userPropArr[i] == null) {
+ userPropArr[i] = "";
+ }
+ }
+ return trans.translate("footer.with.userdata", userPropArr);
}
public static String getTitleForFailedUsersError(Locale locale) {
--
GitLab