fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2149 from ether/dont-use-abiword-for-html 

abiword shouldnt be used for HTML native documents
This commit is contained in:
Marcel Klehr 2014-06-11 14:47:33 +02:00
parent 7bec297c0a b74c43889e
commit cd294c608b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/node/handler/ImportHandler.js
View File

@ -114,7 +114,9 @@ exports.doImport = function(req, res, padId)
//convert file to html //convert file to html
function(callback) { function(callback) {
if(!importHandledByPlugin){ if(!importHandledByPlugin){
if (abiword) { var fileEnding = path.extname(srcFile).toLowerCase();
var fileIsHTML = (fileEnding === ".html" || fileEnding === ".htm");
if (abiword && !fileIsHTML) {
abiword.convertFile(srcFile, destFile, "htm", function(err) { abiword.convertFile(srcFile, destFile, "htm", function(err) {
//catch convert errors //catch convert errors
if(err) { if(err) {