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

plugins always return html so use that endpoint

This commit is contained in:
John McLear 2015-04-29 20:54:41 +01:00
parent da06ac6fd7
commit 4938c7be38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,7 @@ exports.doImport = function(req, res, padId)
function(callback) { function(callback) {
if(!directDatabaseAccess){ if(!directDatabaseAccess){
var fileEnding = path.extname(srcFile).toLowerCase(); var fileEnding = path.extname(srcFile).toLowerCase();
if (abiword || fileEnding == ".htm" || fileEnding == ".html") { if (importHandledByPlugin || abiword || fileEnding == ".htm" || fileEnding == ".html") {
importHtml.setPadHTML(pad, text, function(e){ importHtml.setPadHTML(pad, text, function(e){
if(e) apiLogger.warn("Error importing, possibly caused by malformed HTML"); if(e) apiLogger.warn("Error importing, possibly caused by malformed HTML");
}); });