summaryrefslogtreecommitdiff
path: root/src/node
diff options
context:
space:
mode:
authorChris Birk <cmbirk@gmail.com>2015-12-18 00:14:13 -0600
committerChris Birk <cmbirk@gmail.com>2015-12-18 00:14:13 -0600
commitd6033de0dafd5f8cf9f8ab943f63f41410b78bdd (patch)
treef9c4de58c659cdf0d46e57b9efca3e202f2a6988 /src/node
parent313f390e7a3cbd01e8d96ab8aa5b8894e021b883 (diff)
downloadetherpad-lite-d6033de0dafd5f8cf9f8ab943f63f41410b78bdd.zip
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
Diffstat (limited to 'src/node')
-rw-r--r--src/node/hooks/express/importexport.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js
index f3f05163..5ebac1db 100644
--- a/src/node/hooks/express/importexport.js
+++ b/src/node/hooks/express/importexport.js
@@ -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;
}