diff options
author | szaimen <szaimen@e.mail.de> | 2021-08-16 12:16:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-16 12:16:22 +0200 |
commit | 9585c4f2561efd04a85b72b1100bd3593129b00c (patch) | |
tree | 59797889ba03064a6c35d7f97b0a6a84931a5ee1 | |
parent | 6844449465a23279596916720e637316bfedcf0d (diff) | |
parent | 98102bfa780651505bcbaac0832e56c43c10389b (diff) | |
download | nextcloud-server-9585c4f2561efd04a85b72b1100bd3593129b00c.tar.gz nextcloud-server-9585c4f2561efd04a85b72b1100bd3593129b00c.zip |
Merge pull request #28211 from nextcloud/fix/27496/improve-auto-expiration-hint
Improve auto expiration hint for trashbin and file versions
-rw-r--r-- | apps/files_trashbin/lib/Command/ExpireTrash.php | 2 | ||||
-rw-r--r-- | apps/files_versions/lib/Command/ExpireVersions.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php index b863f3a1fba..bcecbfceeff 100644 --- a/apps/files_trashbin/lib/Command/ExpireTrash.php +++ b/apps/files_trashbin/lib/Command/ExpireTrash.php @@ -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; } diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php index bc080d93184..43068e21451 100644 --- a/apps/files_versions/lib/Command/ExpireVersions.php +++ b/apps/files_versions/lib/Command/ExpireVersions.php @@ -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; } |