aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@primarypad.com>2010-03-27 19:20:04 +0000
committerroot <root@primarypad.com>2010-03-27 19:20:04 +0000
commite24352483b7efc151e6b5995bddac3c89d04a6cc (patch)
tree79a2ab3f75d1ae600092dd9249f22abe93cf9452
parentbb52de2259c58d36265c8af63c5c141e07ed466a (diff)
downloadetherpad-e24352483b7efc151e6b5995bddac3c89d04a6cc.tar.gz
etherpad-e24352483b7efc151e6b5995bddac3c89d04a6cc.tar.xz
etherpad-e24352483b7efc151e6b5995bddac3c89d04a6cc.zip
Fixed .txt file import - NOT open office import, just basic text import
-rw-r--r--infrastructure/net.appjet.oui/main.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/infrastructure/net.appjet.oui/main.scala b/infrastructure/net.appjet.oui/main.scala
index 42cd268..8181fdf 100644
--- a/infrastructure/net.appjet.oui/main.scala
+++ b/infrastructure/net.appjet.oui/main.scala
@@ -220,9 +220,9 @@ object main {
val handler = new Context(server, "/", Context.NO_SESSIONS | Context.NO_SECURITY);
handler.addServlet(new ServletHolder(new OuiServlet), "/");
-// val filterHolder = new FilterHolder(new MultipartFilter());
-// filterHolder.setInitParameter("uploadDir", System.getProperty("java.io.tmpdir"));
-// handler.addFilter(filterHolder, "/*", 1);
+ val filterHolder = new FilterHolder(new MultipartFilter());
+ filterHolder.setInitParameter("uploadDir", System.getProperty("java.io.tmpdir"));
+ handler.addFilter(filterHolder, "/*", 1);
global.context = handler;