aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Repair.php
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2019-02-01 21:13:06 +0100
committerMorris Jobke <hey@morrisjobke.de>2019-02-07 16:23:18 +0100
commit382495e26d165c0c76616aca455ce9ba3e2df0b7 (patch)
tree50434696a2e663fdffe1ce83de25d0488f449800 /lib/private/Repair.php
parent0e9903c420aee76648e61c4c14b750ea01125bb1 (diff)
downloadnextcloud-server-382495e26d165c0c76616aca455ce9ba3e2df0b7.tar.gz
nextcloud-server-382495e26d165c0c76616aca455ce9ba3e2df0b7.zip
Repair step to remove "photo." files created by photocache
Before https://github.com/nextcloud/server/pull/13843 a "photo." file could be created for unsupported image formats by photocache. Because a file is present but not jpg, png or gif no photo could be returned for this vcard. These invalid files are removed by this repair step. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib/private/Repair.php')
-rw-r--r--lib/private/Repair.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 641475cf386..5201c88de7c 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -30,14 +30,11 @@
namespace OC;
-use OCP\AppFramework\QueryException;
-use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
use OC\Avatar\AvatarManager;
use OC\Repair\AddCleanupUpdaterBackupsJob;
use OC\Repair\CleanTags;
-use OC\Repair\ClearGeneratedAvatarCache;
use OC\Repair\ClearFrontendCaches;
+use OC\Repair\ClearGeneratedAvatarCache;
use OC\Repair\Collation;
use OC\Repair\MoveUpdaterStepFile;
use OC\Repair\NC11\FixMountStorages;
@@ -46,6 +43,7 @@ use OC\Repair\NC13\RepairInvalidPaths;
use OC\Repair\NC14\AddPreviewBackgroundCleanupJob;
use OC\Repair\NC14\RepairPendingCronJobs;
use OC\Repair\NC15\SetVcardDatabaseUID;
+use OC\Repair\NC16\CleanupCardDAVPhotoCache;
use OC\Repair\OldGroupMembershipShares;
use OC\Repair\Owncloud\DropAccountTermsTable;
use OC\Repair\Owncloud\SaveAccountsTableData;
@@ -55,6 +53,9 @@ use OC\Repair\RepairMimeTypes;
use OC\Repair\SqliteAutoincrement;
use OC\Template\JSCombiner;
use OC\Template\SCSSCacher;
+use OCP\AppFramework\QueryException;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\GenericEvent;
@@ -147,7 +148,8 @@ class Repair implements IOutput {
new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
- new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger())
+ new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()),
+ new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache')),
];
}