You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/11 14:29:51 UTC
[1/2] openmeetings git commit: no jira: Strings.escapeMarkup is used
instead of StringEscapeUtils.escapeHtml4
Repository: openmeetings
Updated Branches:
refs/heads/master c202ac99b -> 58882410c
no jira: Strings.escapeMarkup is used instead of StringEscapeUtils.escapeHtml4
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/cd64da45
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cd64da45
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cd64da45
Branch: refs/heads/master
Commit: cd64da450e02a7b5b05dadc6ae1af577e2257542
Parents: 91d5f08
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu May 11 21:28:35 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu May 11 21:29:26 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/core/util/WebSocketHelper.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cd64da45/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index 3421f16..7321a5c 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.core.util;
-import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.wicket.util.string.Strings.escapeMarkup;
import java.io.IOException;
import java.util.Arrays;
@@ -29,7 +29,6 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
@@ -76,7 +75,7 @@ public class WebSocketHelper {
}
private static String getName(User u) {
- return escapeHtml4(String.format("%s %s", u.getFirstname(), u.getLastname()));
+ return escapeMarkup(String.format("%s %s", u.getFirstname(), u.getLastname())).toString();
}
private static JSONObject setScope(JSONObject o, ChatMessage m, long curUserId) {
[2/2] openmeetings git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/openmeetings
Posted by so...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/58882410
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/58882410
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/58882410
Branch: refs/heads/master
Commit: 58882410c89d885954fb657212fe61f780ecc473
Parents: cd64da4 c202ac9
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu May 11 21:29:39 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu May 11 21:29:39 2017 +0700
----------------------------------------------------------------------
.../db/dao/basic/ConfigurationDao.java | 21 --------------------
.../db/entity/basic/Configuration.java | 2 +-
.../openmeetings/backup/BackupExport.java | 2 +-
3 files changed, 2 insertions(+), 23 deletions(-)
----------------------------------------------------------------------