Skip to content

[stable21] Get the parent directory before creating a file from a template #26406

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
skjnldsv merged 2 commits into from
Apr 2, 2021
Merged

[stable21] Get the parent directory before creating a file from a template #26406

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89a19a3
Get the parent directory before creating a file from a template
juliusknorr Mar 31, 2021
dc8e819
Properly handle creating the template directory in a subfolder (fixes…
juliusknorr Mar 31, 2021
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
Prev Previous commit
Properly handle creating the template directory in a subfolder (fixes #… 
…25787)

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot
juliusknorr authored and backportbot[bot] committed Apr 1, 2021
commit dc8e819915acc045bcbc67df098231db30ffb240
6 changes: 3 additions & 3 deletions lib/private/Files/Template/TemplateManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\Template\FileCreatedFromTemplateEvent;
use OCP\Files\Template\ICustomTemplateProvider;
use OCP\Files\Template\ITemplateManager;
Expand Down Expand Up @@ -299,9 +298,10 @@ public function initializeTemplateDirectory(string $path = null, string $userId
}

try {
$folder = $userFolder->newFolder($userTemplatePath);
} catch (NotPermittedException $e) {
$folder = $userFolder->get($userTemplatePath);
} catch (NotFoundException $e) {
$folder = $userFolder->get(dirname($userTemplatePath));
$folder = $folder->newFolder(basename($userTemplatePath));
}

$folderIsEmpty = count($folder->getDirectoryListing()) === 0;
Expand Down