diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-01 23:15:45 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-01 23:15:45 +0200 |
| commit | 5c1d64b80e8447b41110a878968cdb72a304a723 (patch) | |
| tree | da5d4da5694f9c59324496c43652dafbafbe9394 /core/avatar | |
| parent | 91fed38f005c723c5d76bc58b8a222e87b0f64dc (diff) | |
| download | nextcloud-server-5c1d64b80e8447b41110a878968cdb72a304a723.tar.gz nextcloud-server-5c1d64b80e8447b41110a878968cdb72a304a723.zip | |
$image doesn't have data() when a defaultavatar should be used
Diffstat (limited to 'core/avatar')
| -rw-r--r-- | core/avatar/controller.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 8be03e3119f..5cf87451b78 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -30,8 +30,8 @@ class OC_Core_Avatar_Controller { \OC_Response::disableCaching(); \OC_Response::setLastModifiedHeader(gmdate( 'D, d M Y H:i:s' ).' GMT'); - \OC_Response::setETagHeader(crc32($image->data())); if ($image instanceof \OC_Image) { + \OC_Response::setETagHeader(crc32($image->data())); $image->show(); } elseif ($image === false) { \OC_JSON::success(array('user' => \OC_User::getDisplayName($user), 'size' => $size)); |