Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java,v
diff -u -r1.12 -r1.13
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java	11 Feb 2010 00:48:16 -0000	1.12
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java	11 Feb 2010 05:27:09 -0000	1.13
@@ -61,10 +61,12 @@
 	{
 	  	    
 	    String zipFilename = WebUtil.readStrParam(request, ExportPortfolioConstants.PARAM_FILE_LOCATION);
+	    zipFilename = new String(zipFilename.getBytes(), "UTF-8");
 	    
 	    /* Extract taken from org.lamsfoundation.lams.contentrepository.client.Download servlet */
 	    response.setContentType("application/x-download");
-		response.setHeader("Content-Disposition","attachment;filename=\""+getFilename(zipFilename)+"\"");
+	    String filename = FileUtil.encodeFilenameForDownload(request, getFilename(zipFilename));
+		response.setHeader("Content-Disposition","attachment;filename=\""+filename+"\"");
 		
 		InputStream in = new BufferedInputStream(new FileInputStream(new File(constructAbsolutePath(zipFilename)))); 
 		OutputStream out = response.getOutputStream();