r1155 - xwiki/trunk/src/main/java/com/xpn/xwiki/doc

[Ludovic Dubost]

Author: ludovic
Date: 2006-08-16 10:43:54 +0200 (Wed, 16 Aug 2006)
New Revision: 1155

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
Log:
Fix isProgrammaticContent and isAdvancedContent to look for lowercase

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-08-16 08:23:43 UTC (rev 1154)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-08-16 08:43:54 UTC (rev 1155)
@@ -2554,7 +2554,7 @@
         String[] matches = { "<%" , "#set", "#include", "#if",  "public class",  "/* Advanced content */", "## Advanced content", "/* Programmatic content */", "## Programmatic content" };
         String content2 = content.toLowerCase();
         for (int i=0;i<matches.length;i++) {
-            if (content2.indexOf(matches[i])!=-1)
+            if (content2.indexOf(matches[i].toLowerCase())!=-1)
                 return true;
         }
 
@@ -2570,14 +2570,14 @@
     }
 
     public boolean isProgrammaticContent() {
-        String[] matches = { "<%" , "$xwiki.xWiki", "$context.context", "$doc.document", "$xwiki.getXWiki()", "$context.getContext()",
+        String[] matches = { "<%" , "\\$xwiki.xWiki", "$context.context", "$doc.document", "$xwiki.getXWiki()", "$context.getContext()",
                 "$doc.getDocument()", "WithProgrammingRights(", "/* Programmatic content */", "## Programmatic content",
                 "$xwiki.search(", "$xwiki.createUser", "$xwiki.createNewWiki", "$xwiki.addToAllGroup", "$xwiki.sendMessage",
                 "$xwiki.copyDocument", "$xwiki.copyWikiWeb", "$xwiki.parseGroovyFromString", "$doc.toXML()", "$doc.toXMLDocument()",
                 };
         String content2 = content.toLowerCase();
         for (int i=0;i<matches.length;i++) {
-            if (content2.indexOf(matches[i])!=-1)
+            if (content2.indexOf(matches[i].toLowerCase())!=-1)
                 return true;
         }