r1537 - in xwiki/trunk/core/src/main/java/com/xpn/xwiki: api web

[Ludovic Dubost]

Author: ludovic
Date: 2006-11-13 14:17:15 +0100 (Mon, 13 Nov 2006)
New Revision: 1537

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/UploadAction.java
Log:
JIRA #410 Real Fix for filename under internet explorer in function addAttachment


Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java	2006-11-12 16:00:51 UTC (rev 1536)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java	2006-11-13 13:17:15 UTC (rev 1537)
@@ -1296,9 +1296,9 @@
             byte[] data = fileupload.getFileItemData(name, context);
             String filename;
             String fname = fileupload.getFileName(name, context);
-            int i = fname.indexOf("\\");
+            int i = fname.lastIndexOf("\\");
             if (i==-1)
-                i = fname.indexOf("/");
+                i = fname.lastIndexOf("/");
             filename = fname.substring(i+1);
             filename = filename.replaceAll("\\+"," ");
 

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/UploadAction.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/UploadAction.java	2006-11-12 16:00:51 UTC (rev 1536)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/UploadAction.java	2006-11-13 13:17:15 UTC (rev 1537)
@@ -60,9 +60,9 @@
         byte[] data = fileupload.getFileItemData("filepath", context);
         if (filename==null) {
             String fname = fileupload.getFileName("filepath", context);
-            int i = fname.indexOf("\\");
+            int i = fname.lastIndexOf("\\");
             if (i==-1)
-                i = fname.indexOf("/");
+                i = fname.lastIndexOf("/");
             filename = fname.substring(i+1);
         }
         filename = filename.replaceAll("\\+"," ");