summaryrefslogtreecommitdiffstats
path: root/lib/avatar.php
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-09-01 21:17:48 +0200
committerkondou <kondou@ts.unde.re>2013-09-01 21:17:48 +0200
commit74c922328123fe40265e3f4e42a34feff057c0d6 (patch)
treed8f0a77ecd1f3b2f88fafc076f317cd5ed28241b /lib/avatar.php
parentc95d4cafa90ab1775cae1fd5d70f098005f8b134 (diff)
downloadnextcloud-server-74c922328123fe40265e3f4e42a34feff057c0d6.tar.gz
nextcloud-server-74c922328123fe40265e3f4e42a34feff057c0d6.zip
Properly check for tmpavatar, invalidate cache, fix debug msgs
Diffstat (limited to 'lib/avatar.php')
-rw-r--r--lib/avatar.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/avatar.php b/lib/avatar.php
index eb1f2e18295..5ecce050d24 100644
--- a/lib/avatar.php
+++ b/lib/avatar.php
@@ -28,7 +28,8 @@ class OC_Avatar {
return false;
}
- $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext));
+ $avatar = new OC_Image();
+ $avatar->loadFromData($view->file_get_contents('avatar.'.$ext));
$avatar->resize($size);
return $avatar;
}