diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-30 14:27:05 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-30 14:27:05 +0100 |
| commit | 995ceeb8d92b6bbb5e059c4246609c68211a0aa0 (patch) | |
| tree | fa90a3a6b9520570ad0d6beb7542a1221d90491a /lib/private | |
| parent | fc21aa6c41c231b4ae2e9fcca39c1774948d7ba6 (diff) | |
| parent | 6b7e74824583739145c3e6add0113647c2c22cb3 (diff) | |
| download | nextcloud-server-995ceeb8d92b6bbb5e059c4246609c68211a0aa0.tar.gz nextcloud-server-995ceeb8d92b6bbb5e059c4246609c68211a0aa0.zip | |
Merge pull request #20815 from owncloud/avatar-cache-size
cache resized avatars
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/avatar.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/avatar.php b/lib/private/avatar.php index baaccaa86e6..90a8b8c26f9 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -67,8 +67,13 @@ class Avatar implements \OCP\IAvatar { } $avatar = new OC_Image(); - $avatar->loadFromData($this->view->file_get_contents('avatar.'.$ext)); - $avatar->resize($size); + if ($this->view->file_exists('avatar.' . $size . '.' . $ext)) { + $avatar->loadFromData($this->view->file_get_contents('avatar.' . $size . '.' . $ext)); + } else { + $avatar->loadFromData($this->view->file_get_contents('avatar.' . $ext)); + $avatar->resize($size); + $this->view->file_put_contents('avatar.' . $size . '.' . $ext, $avatar->data()); + } return $avatar; } |