Merge remote-tracking branch 'origin/master' into V5

sanluan · Aug 8, 2024 · 7477623 · 7477623
2 parents 2dbb7b0 + c4701fc
commit 7477623
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/publiccms-parent/build.gradle b/publiccms-parent/build.gradle
@@ -23,7 +23,7 @@ subprojects {
     apply plugin: "eclipse-wtp"
 
     group = "com.publiccms"
-    version = "V5.202406.c"
+    version = "V5.202406.d"
 
     test.enabled = false
 

diff --git a/publiccms-parent/pom.xml b/publiccms-parent/pom.xml
@@ -21,7 +21,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <version.publiccms>V5.202406.c</version.publiccms>
+        <version.publiccms>V5.202406.d</version.publiccms>
         <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
         <version.servlet>6.1.0</version.servlet>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->

diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java
@@ -38,7 +38,7 @@ public static final String getVersion() {
      * @return revision
      */
     public static final String getRevision() {
-        return "c";
+        return "d";
     }
 
     /**

diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsTemplate/metadata.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsTemplate/metadata.html
@@ -219,7 +219,7 @@
     </#if>
     </script>
     <#if a?has_content>
-            <textarea name="content" class="hide"><@tools.fileContent path=path>${(object)!}</@tools.fileContent></textarea>
+            <textarea name="content" class="hide" escape="true"><@tools.fileContent path=path>${(object)!}</@tools.fileContent></textarea>
             <script>
         <#if site.useStatic&&(a.publishPath)?has_content>
                 $('input[name=useStatic]',navTab.getCurrentPanel()).click();
@@ -235,7 +235,7 @@
         </#if>
             </script>
     <#elseif demo?has_content>
-            <textarea name="content" class="hide"><@html_escape><#include "demo/"+demo parse=false/></@html_escape></textarea>
+            <textarea name="content" class="hide" escape="true"><@html_escape><#include "demo/"+demo parse=false/></@html_escape></textarea>
             <script>
         <#if name?has_content>
                 $('input[name=alias]',navTab.getCurrentPanel()).val('<@t.page name/>');