Changeset 2537

Timestamp:

10/09/08 23:17:06 (5 years ago)

Author:

mosipov

Message:

CLOSED - #2355: FCK:editor output is not XHTML 1.0 compliant

Location:

FCKeditor.Java/branches/2.4.x/java-core/src/main/java/net/fckeditor

Files:

• FCKeditor.java (modified) (3 diffs, 1 prop)
• FCKeditorConfig.java (modified) (2 diffs, 1 prop)

FCKeditor.Java/branches/2.4.x/java-core/src/main/java/net/fckeditor/FCKeditor.java

@@ -202 +202 @@
                  * 2.4 StringUtils#replaceEach(String, String[], String[])
                  */
-                str = str.replaceAll("&", "&");
-                str = str.replaceAll("<", "&#60;");
-                str = str.replaceAll(">", "&#62;");
-                str = str.replaceAll("\"", "&#34;");
+                str = str.replaceAll("&", "&amp;");
+                str = str.replaceAll("<", "&lt;");
+                str = str.replaceAll(">", "&gt;");
+                str = str.replaceAll("\"", "&quot;");
                 str = str.replaceAll("'", "&#39;");
                 return str;
@@ -251 +251 @@
                                 instanceName);
                         if (Utils.isNotEmpty(toolbarSet))
-                                sLink += "&Toolbar=".concat(toolbarSet);
+                                sLink += "&amp;Toolbar=".concat(toolbarSet);
                         XHtmlTagTool iframeTag = new XHtmlTagTool("iframe", XHtmlTagTool.SPACE);
                         iframeTag.addAttribute("id", instanceName.concat("___Frame"));
@@ -257 +257 @@
                         iframeTag.addAttribute("width", width);
                         iframeTag.addAttribute("height", height);
-                        iframeTag.addAttribute("frameborder", "no");
+                        iframeTag.addAttribute("frameborder", "0");
                         iframeTag.addAttribute("scrolling", "no");
                         strEditor.append(iframeTag);

FCKeditor.Java/branches/2.4.x/java-core/src/main/java/net/fckeditor/FCKeditorConfig.java

@@ -62 +62 @@
                         for (Map.Entry<String, String> entry : this.entrySet()) {
                                 if (Utils.isNotEmpty(entry.getValue())) {
-                                        osParams.append("&");
+                                        osParams.append("&amp;");
                                         osParams.append(URLEncoder.encode(entry.getKey(),"UTF-8"));
                                         osParams.append("=");
@@ -74 +74 @@
                 
                 if (osParams.length() > 0)
-                        osParams.deleteCharAt(0);
+                        osParams.delete(0,5);
                 return osParams.toString();
         }