[Aplaws-commit] r93 - ccm-cms/trunk/src/com/arsdigita/cms/dispatcher

[<mb...@re...>]

Author: mbooth
Date: 2004-11-11 19:14:35 +0100 (Thu, 11 Nov 2004)
New Revision: 93

Modified:
   ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
Log:
Fix a bug which prevents resolution of items containing special characters


Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java	2004-11-11 16:45:33 UTC (rev 92)
+++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java	2004-11-11 18:14:35 UTC (rev 93)
@@ -35,7 +35,6 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -722,19 +721,20 @@
             // will have deal with 'foo' folder.
 
             String name = index > 0 ? url.substring(0, index) : "";
-            parentFolder = name != "" ? (Folder) parentFolder.getItem(URLEncoder.encode(name), true) : parentFolder;
+            parentFolder = name != "" ? (Folder) parentFolder.getItem(name, true) : parentFolder;
             url = index + 1 < len ? url.substring(index + 1) : "";
 
             return getItemFromLiveURL(url, parentFolder);
         } else {
             s_log.debug("Found a file element in the URL");
 
-	    String[] nameAndLang = getNameAndLangFromURLFrag(url);
+            String[] nameAndLang = getNameAndLangFromURLFrag(url);
             String name = nameAndLang[0];
             String lang = nameAndLang[1];
 
-            ContentItem item = parentFolder.getItem(URLEncoder.encode(name), false);
-	    return getItemFromLangAndBundle(lang, item);
+            ContentItem item = parentFolder.getItem(name, false);
+
+            return getItemFromLangAndBundle(lang, item);
         }
     }