diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
| commit | ac609e804078cf70fcc02b36aa1eb40115354715 (patch) | |
| tree | c206723a0fe28fd62f8d2838f589a42ec7523af5 /lib/imagefile.php | |
| parent | 17c50f338ceb574780476f6b788f48e2d7d06017 (diff) | |
| parent | 4a6c9e445149e42a4f81d5140296e7770c60bc6c (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
Diffstat (limited to 'lib/imagefile.php')
| -rw-r--r-- | lib/imagefile.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/imagefile.php b/lib/imagefile.php index 2134623b1..e47287741 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -67,10 +67,8 @@ class ImageFile $info[2] == IMAGETYPE_BMP || ($info[2] == IMAGETYPE_WBMP && function_exists('imagecreatefromwbmp')) || ($info[2] == IMAGETYPE_XBM && function_exists('imagecreatefromxbm')) || - ($info[2] == IMAGETYPE_XPM && function_exists('imagecreatefromxpm')) || ($info[2] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')))) { - @unlink($_FILES[$param]['tmp_name']); throw new Exception(_('Unsupported image file format.')); return; } @@ -161,9 +159,6 @@ class ImageFile case IMAGETYPE_XBM: $image_src = imagecreatefromxbm($this->filepath); break; - case IMAGETYPE_XPM: - $image_src = imagecreatefromxpm($this->filepath); - break; default: throw new Exception(_('Unknown file type')); return; @@ -206,10 +201,6 @@ class ImageFile //we don't want to save XBM... it's a rare format that we can't guarantee clients will support //save png instead $this->type = IMAGETYPE_PNG; - } else if($this->type == IMAGETYPE_XPM) { - //we don't want to save XPM... it's a rare format that we can't guarantee clients will support - //save png instead - $this->type = IMAGETYPE_PNG; } $outname = Avatar::filename($this->id, |