mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

ImportHandler: Pass ImportError to import hook

Browse source
This commit is contained in:
Richard Hansen 2021-12-10 02:34:13 -05:00
parent d1da8f1ebd
commit 4d457f6296
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,8 +142,8 @@ const doImport = async (req, res, padId) => {
}
const destFile = path.join(tmpDirectory, `etherpad_import_${randNum}.${exportExtension}`);
const importHandledByPlugin =
(await hooks.aCallAll('import', {srcFile, destFile, fileEnding, padId})).some((x) => x);
const context = {srcFile, destFile, fileEnding, padId, ImportError};
const importHandledByPlugin = (await hooks.aCallAll('import', context)).some((x) => x);
const fileIsEtherpad = (fileEnding === '.etherpad');
const fileIsHTML = (fileEnding === '.html' || fileEnding === '.htm');
const fileIsTXT = (fileEnding === '.txt');