upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #28446 from nextcloud/backport/28211/stable22

Browse source 
[stable22] Improve auto expiration hint for trashbin and file versions
This commit is contained in:
Louis 2021-08-16 13:19:27 +02:00 committed by GitHub
commit e9fc8e1dcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_trashbin/lib/Command/ExpireTrash.php
View file

@ -74,7 +74,7 @@ class ExpireTrash extends Command {
protected function execute(InputInterface $input, OutputInterface $output): int {
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
if (!$maxAge) {
$output->writeln("No expiry configured.");
$output->writeln("Auto expiration is configured - keeps files and folders in the trash bin for 30 days and automatically deletes anytime after that if space is needed (note: files may not be deleted if space is not needed)");
return 1;
}

2
apps/files_versions/lib/Command/ExpireVersions.php
View file

@ -73,7 +73,7 @@ class ExpireVersions extends Command {
protected function execute(InputInterface $input, OutputInterface $output): int {
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
if (!$maxAge) {
$output->writeln("No expiry configured.");
$output->writeln("Auto expiration is configured - expiration will be handled automatically according to the expiration patterns detailed at the following link https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/file_versioning.html.");
return 1;
}