mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-12-11 18:09:51 +01:00
commit c72cd49ede
7 changed files with 378 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
node/server.js
View file

@ -273,7 +273,7 @@ async.waterfall([
return;
}
var types = ["pdf", "doc", "txt", "html", "odt"];
var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"];
//send a 404 if we don't support this filetype
if(types.indexOf(req.params.type) == -1)
{
@ -282,7 +282,8 @@ async.waterfall([
}
//if abiword is disabled, and this is a format we only support with abiword, output a message
if(settings.abiword == null && req.params.type != "html" && req.params.type != "txt" )
if(settings.abiword == null &&
["odt", "pdf", "doc"].indexOf(req.params.type) !== -1)
{
res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature");
return;