public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ImportHandler: early return via DeMorgan's law 

Inverted a boolean condition, no functional changes.
pull/3509/head
muxator 2018-10-31 23:15:01 +01:00
parent 9d104cc4b0
commit fb552b2dbb
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,13 @@ exports.doImport = function(req, res, padId)
var fileIsTXT = (fileEnding === ".txt");
if (fileIsTXT) useConvertor = false; // Don't use convertor for text files
// See https://github.com/ether/etherpad-lite/issues/2572
if (useConvertor && !fileIsHTML) {
if (fileIsHTML || (useConvertor === false)) {
// if no convertor only rename
fs.rename(srcFile, destFile, callback);
return;
}
convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
//catch convert errors
if(err) {
@ -179,10 +185,6 @@ exports.doImport = function(req, res, padId)
callback();
}
});
} else {
// if no convertor only rename
fs.rename(srcFile, destFile, callback);
}
},
function(callback) {