diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-30 17:00:09 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-30 17:00:09 +0200 |
| commit | 66ee9d56fca2d4d586726d4654b761e03d7c69d2 (patch) | |
| tree | 3883883e5b16293f1b1e8a7c7d0c1be195da42d4 | |
| parent | 748a59db11df20f82a90dadd657af700ce94cc2d (diff) | |
| parent | c22697e09ed063df0d035db36e04f0e0811d599d (diff) | |
| download | nextcloud-server-66ee9d56fca2d4d586726d4654b761e03d7c69d2.tar.gz nextcloud-server-66ee9d56fca2d4d586726d4654b761e03d7c69d2.zip | |
Merge pull request #23628 from owncloud/avatar-remove
only remove avatars from the folder we store them in
| -rw-r--r-- | lib/private/avatar.php | 2 | ||||
| -rw-r--r-- | tests/lib/avatartest.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/avatar.php b/lib/private/avatar.php index 4b9d3d82404..3f8038360a4 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -134,7 +134,7 @@ class Avatar implements IAvatar { */ public function remove () { $regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/'; - $avatars = $this->folder->search('avatar'); + $avatars = $this->folder->getDirectoryListing(); foreach ($avatars as $avatar) { if (preg_match($regex, $avatar->getName())) { diff --git a/tests/lib/avatartest.php b/tests/lib/avatartest.php index b2b69ac1a6c..b0ab4cb8b5c 100644 --- a/tests/lib/avatartest.php +++ b/tests/lib/avatartest.php @@ -148,8 +148,7 @@ class AvatarTest extends \Test\TestCase { ->willReturn('avatarX'); $nonAvatarFile->expects($this->never())->method('delete'); - $this->folder->method('search') - ->with('avatar') + $this->folder->method('getDirectoryListing') ->willReturn([$avatarFileJPG, $avatarFilePNG, $resizedAvatarFile, $nonAvatarFile]); $newFile = $this->getMock('\OCP\Files\File'); |