sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not create folder just to delete it afterwards 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
pull/15290/head
Arthur Schiwon 2019-04-29 16:15:07 +07:00
parent 009c2dfbd5
commit 3c78116cf8
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/dav/lib/CardDAV/PhotoCache.php
Unescape Escape View File

@ -167,16 +167,19 @@ class PhotoCache {
}
/**
* @param int $addressBookId
* @param string $cardUri
* @return ISimpleFolder
* @throws NotFoundException
* @throws NotPermittedException
*/
private function getFolder($addressBookId, $cardUri) {
private function getFolder(int $addressBookId, string $cardUri, bool $createIfNotExists = true): ISimpleFolder {
$hash = md5($addressBookId . ' ' . $cardUri);
try {
return $this->appData->getFolder($hash);
} catch (NotFoundException $e) {
return $this->appData->newFolder($hash);
if($createIfNotExists) {
return $this->appData->newFolder($hash);
} else {
throw $e;
}
}
}
@ -271,9 +274,14 @@ class PhotoCache {
/**
* @param int $addressBookId
* @param string $cardUri
* @throws NotPermittedException
*/
public function delete($addressBookId, $cardUri) {
$folder = $this->getFolder($addressBookId, $cardUri);
$folder->delete();
try {
$folder = $this->getFolder($addressBookId, $cardUri, false);
$folder->delete();
} catch (NotFoundException $e) {
// that's OK, nothing to do
}
}
}