Author: michiel
Date: 2009-11-23 14:33:54 +0100 (Mon, 23 Nov 2009)
New Revision: 39846

Modified:
   
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java
Log:
default regexp didn't make much sense

Modified: 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java
===================================================================
--- 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java
    2009-11-23 13:05:52 UTC (rev 39845)
+++ 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java
    2009-11-23 13:33:54 UTC (rev 39846)
@@ -110,7 +110,7 @@
         if (excludeForEncoding == null) {
             String setting = 
pageContext.getServletContext().getInitParameter("mmbase.taglib.url.excludeForEncoding");
             if (setting == null) {
-                setting = "([.]ico$[.]jpg$|[.]gif$|[.]png$|[.]css$|[.]js$)";
+                setting = ".*\\.(ico|jpg|gif|png|css|js)";
                 log.info("No setting 'mmbase.taglib.url.excludeForEncoding' 
found in web.xml. Taking it '" + setting + "'");
             }
             excludeForEncoding = Pattern.compile(setting);
@@ -119,6 +119,10 @@
         if (excludeForEncoding.matcher(getPage()).matches()) {
             defaultEncode = false;
         }
+        if (log.isDebugEnabled()) {
+            log.debug("Default encode for " + getPage() + " " + defaultEncode 
+ " so " + encode.getBoolean(this, defaultEncode));
+        }
+
         return encode.getBoolean(this, defaultEncode);
     }
     /**

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to