[xwiki-notifications] r4747 - in xwiki-platform/core/branches/xwiki-core-1.1/src: main/java/com/xpn/xwiki/render/filter main/resources/META-INF/services test/java/com/xpn/xwiki/render

[Vincent Massol]

Author: vmassol
Date: 2007-09-06 15:22:03 +0200 (Thu, 06 Sep 2007)
New Revision: 4747

Added:
   
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/render/filter/EscapeFilter.java
Modified:
   
xwiki-platform/core/branches/xwiki-core-1.1/src/main/resources/META-INF/services/com.xpn.xwiki.render.filter.XWikiFilter
   
xwiki-platform/core/branches/xwiki-core-1.1/src/test/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngineTest.java
Log:
XWIKI-1705: Single backslashes inside {code} block

Merged from trunk (rev 4746)

Copied: 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/render/filter/EscapeFilter.java
 (from rev 4746, 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/filter/EscapeFilter.java)

Modified: 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/resources/META-INF/services/com.xpn.xwiki.render.filter.XWikiFilter
===================================================================
--- 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/resources/META-INF/services/com.xpn.xwiki.render.filter.XWikiFilter
    2007-09-06 13:21:02 UTC (rev 4746)
+++ 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/resources/META-INF/services/com.xpn.xwiki.render.filter.XWikiFilter
    2007-09-06 13:22:03 UTC (rev 4747)
@@ -1,6 +1,8 @@
 # Remove any content inside the Code macro so that it doesn't get evaluated by 
other Radeox macros.
-# The content is restored later on in the CodeRestoreFilter. 
+# The content is restored later on in the CodeRestoreFilter. The filter has to 
be executed first
+# to ensure no modifications is done to the content.
 com.xpn.xwiki.render.filter.CodeRemoveFilter
+com.xpn.xwiki.render.filter.EscapeFilter
 org.radeox.filter.ParamFilter
 com.xpn.xwiki.render.filter.StyleFilter
 com.xpn.xwiki.render.filter.MacroFilter
@@ -25,5 +27,3 @@
 com.xpn.xwiki.render.filter.CodeRestoreFilter
 # The CodeFilter filter calls the XWikiCodeMacro for performing the rendering
 com.xpn.xwiki.render.filter.CodeFilter
-#Should be called first, done with before()
-org.radeox.filter.EscapeFilter

Modified: 
xwiki-platform/core/branches/xwiki-core-1.1/src/test/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngineTest.java
===================================================================
--- 
xwiki-platform/core/branches/xwiki-core-1.1/src/test/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngineTest.java
 2007-09-06 13:21:02 UTC (rev 4746)
+++ 
xwiki-platform/core/branches/xwiki-core-1.1/src/test/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngineTest.java
 2007-09-06 13:22:03 UTC (rev 4747)
@@ -68,6 +68,7 @@
         // Last we also ensure that a second code macro works too.
         String text = "{code:none}\n"
                + "1 Title\n"
+            + "c:\\dev\n"
             + "#info(\"test\")\n"
             + "<pre>hello</pre>\n"
             + "$xwiki.getVersion()\n"
@@ -84,7 +85,8 @@
             + "{code}";
         
         String expectedText = "<div class=\"code\"><pre>1 Title\n"
-               + "&#35;info(\"test\")\n"
+            + "c:&#92;dev\n"
+            + "&#35;info(\"test\")\n"
                + "&#60;pre&#62;hello&#60;/pre&#62;\n"
                + "&#36;xwiki.getVersion()\n"
                + "&#123;style&#125;style&#123;style&#125;\n"

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications