Author: jvdrean
Date: 2008-02-12 09:57:34 +0100 (Tue, 12 Feb 2008)
New Revision: 7533
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/web/UploadAction.java
Log:
Added some comments about attachment names & encoding
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
2008-02-12 08:33:38 UTC (rev 7532)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
2008-02-12 08:57:34 UTC (rev 7533)
@@ -1719,7 +1719,10 @@
if (i == -1) {
i = fileName.indexOf("/");
}
- String filename = fileName.substring(i + 1);
+ String filename = fileName.substring(i + 1);
+
+ // TODO : avoid name clearing when encoding problems will be solved
+ // JIRA : http://jira.xwiki.org/jira/browse/XWIKI-94
filename = getXWikiContext().getWiki().clearName(filename, false,
true, getXWikiContext());
XWikiAttachment attachment = getDoc().getAttachment(filename);
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/web/UploadAction.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/web/UploadAction.java
2008-02-12 08:33:38 UTC (rev 7532)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/web/UploadAction.java
2008-02-12 08:57:34 UTC (rev 7533)
@@ -84,8 +84,10 @@
i = fname.lastIndexOf("/");
filename = fname.substring(i + 1);
}
- filename = filename.replaceAll("\\+", " ");
-
+ filename = filename.replaceAll("\\+", " ");
+
+ // TODO : avoid name clearing when encoding problems will be solved
+ // JIRA : http://jira.xwiki.org/jira/browse/XWIKI-94
filename = context.getWiki().clearName(filename, false, true, context);
XWikiDocument olddoc = (XWikiDocument) doc.clone();
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
