This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository
https://gitbox.apache.org/repos/asf/ofbiz-framework.gitThe following commit(s) were added to refs/heads/trunk by this push:
new e675f0a Improved: Apply multi-block attr to each application (OFBIZ-11706)
e675f0a is described below
commit e675f0a79f780c4054704bca210380334afd32d0
Author: James Yong <
[hidden email]>
AuthorDate: Fri May 22 00:54:20 2020 +0800
Improved: Apply multi-block attr to each application (OFBIZ-11706)
1. Fix missing Boundary Comment at beginning
2. Apply multi-block attr
---
.../widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java | 2 +-
themes/common-theme/widget/CommonScreens.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index 9acdbf2..221bd85 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -217,7 +217,7 @@ public class HtmlWidget extends ModelScreenWidget {
String data = stringWriter.toString();
stringWriter.close();
- Document doc = Jsoup.parse(data);
+ Document doc = Jsoup.parseBodyFragment(data);
// extract scripts
Elements scriptElements = doc.select("script");
diff --git a/themes/common-theme/widget/CommonScreens.xml b/themes/common-theme/widget/CommonScreens.xml
index a7655d4..9c9172b 100644
--- a/themes/common-theme/widget/CommonScreens.xml
+++ b/themes/common-theme/widget/CommonScreens.xml
@@ -271,7 +271,7 @@ under the License.
<!-- render messages -->
<platform-specific>
<html>
- <html-template location="${messagesTemplateLocation}" />
+ <html-template multi-block="true" location="${messagesTemplateLocation}" />
</html>
</platform-specific>
<!-- render content area -->
Locked
