Skip to content

Include file type in import #3725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnMcLear merged 3 commits into from
Mar 17, 2020
Merged

Include file type in import #3725

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ea5ad9
Merge pull request #2 from ether/develop
JohnMcLear Mar 15, 2020
c696165
Merge pull request #3 from ether/develop
JohnMcLear Mar 17, 2020
b5431b1
pass file ending
JohnMcLear Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/node/handler/ImportHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ async function doImport(req, res, padId)
let destFile = path.join(tmpDirectory, "etherpad_import_" + randNum + "." + exportExtension);

// Logic for allowing external Import Plugins
let result = await hooks.aCallAll("import", { srcFile, destFile });
let result = await hooks.aCallAll("import", { srcFile, destFile, fileEnding });
let importHandledByPlugin = (result.length > 0); // This feels hacky and wrong..

let fileIsEtherpad = (fileEnding === ".etherpad");
Expand Down