From d6033de0dafd5f8cf9f8ab943f63f41410b78bdd Mon Sep 17 00:00:00 2001 From: Chris Birk Date: Fri, 18 Dec 2015 00:14:13 -0600 Subject: [PATCH] Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook --- src/node/hooks/express/importexport.js | 4 ++-- 1 file 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; }