aboutsummaryrefslogtreecommitdiffstats
path: root/include/user.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-07 15:48:04 -0700
committerfriendica <info@friendica.com>2012-06-07 15:48:04 -0700
commit67d8afb9d18df137fddc991443f9b796b5821210 (patch)
treec9f505934f64e6bfa30a9cab64f6732c8ea9537d /include/user.php
parentc4aeb57fcda6253fd9ca91b5177a17b97e3c9b70 (diff)
parentf4a80fcf2474a13b2d733f59f1a928b40841d83c (diff)
downloadvolse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.gz
volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.bz2
volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.zip
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'include/user.php')
-rw-r--r--include/user.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/user.php b/include/user.php
index af43a2b52..2477438bf 100644
--- a/include/user.php
+++ b/include/user.php
@@ -284,7 +284,11 @@ function create_user($arr) {
$filename = basename($photo);
$img_str = fetch_url($photo,true);
- $img = new Photo($img_str);
+ // guess mimetype from headers or filename
+ $type = guess_image_type($photo,true);
+
+
+ $img = new Photo($img_str, $type);
if($img->is_valid()) {
$img->scaleImageSquare(175);
@@ -324,4 +328,4 @@ function create_user($arr) {
$result['user'] = $u;
return $result;
-} \ No newline at end of file
+}