libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook

This commit is contained in:
Chris Birk 2015-12-18 00:14:13 -06:00
parent 313f390e7a
commit d6033de0da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/node/hooks/express/importexport.js
View File

@ -13,9 +13,9 @@ exports.expressCreateServer = function (hook_name, args, cb) {
}
//if abiword is disabled, and this is a format we only support with abiword, output a message
if (settings.abiword == null &&
if (settings.exportAvailable() == "no" &&
["odt", "pdf", "doc"].indexOf(req.params.type) !== -1) {
res.send("Abiword is not enabled at this Etherpad instance. Set the path to Abiword in settings.json to enable this feature");
res.send("This export is not enabled at this Etherpad instance. Set the path to Abiword or SOffice in settings.json to enable this feature");
return;
}