You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2020/04/18 15:21:46 UTC
[roller] branch roller-6.0.x updated (b8df019 -> 0e3aaa2)
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git.
from b8df019 Preparing for 6.0.1 rc-1
new 5941c75 Fix incorrect text key, fix suggested by ghuber
new 0e3aaa2 Fix incorrect text key, fix suggested by ghuber.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java | 1 -
app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
[roller] 01/02: Fix incorrect text key, fix suggested by ghuber
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 5941c751441378ca2d5ab4a97e35dbe5ba27d4ec
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sat Apr 18 11:13:43 2020 -0400
Fix incorrect text key, fix suggested by ghuber
---
.../org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
index 54f619a..af5eacf 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
@@ -66,7 +66,6 @@ public class CommentDataServlet extends HttpServlet {
Weblog weblog = c.getWeblogEntry().getWebsite();
if (weblog.hasUserPermission(rses.getAuthenticatedUser(), WeblogPermission.POST)) {
String content = Utilities.escapeHTML(c.getContent());
- content = WordUtils.wrap(content, 72);
content = StringEscapeUtils.escapeEcmaScript(content);
String json = "{ id: \"" + c.getId() + "\"," + "content: \"" + content + "\" }";
response.setStatus(HttpServletResponse.SC_OK);
[roller] 02/02: Fix incorrect text key, fix suggested by ghuber.
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 0e3aaa24f7c11ea1965e65bb9d352e018dc6f01d
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sat Apr 18 11:14:29 2020 -0400
Fix incorrect text key, fix suggested by ghuber.
---
app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
index 14a2a9a..8f5d083 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
@@ -63,7 +63,7 @@
label="%{getText('createWebsite.locale')}"/>
<s:select name="bean.timeZone" list="timeZonesList"
- label="%{getText('createWebsite.timeZone')}"/>
+ label="%{getText('createWebsite.timezone')}"/>
<s:checkbox name="bean.enableMultiLang"
label="%{getText('websiteSettings.enableMultiLang')}"/>