From 5c1d64b80e8447b41110a878968cdb72a304a723 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 1 Sep 2013 23:15:45 +0200 Subject: [PATCH] $image doesn't have data() when a defaultavatar should be used --- core/avatar/controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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));