aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-29 15:57:36 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-29 15:57:36 +0000
commit4864f1d5b49e4dcd65abe40c8b62b0b403e5b0df (patch)
tree7cf2a29934d9c2910bf412e4c8679dfa4c48358c /engine
parent9a14ea8cfd0a5a8621e17a81426100c59a94d9b5 (diff)
downloadelgg-4864f1d5b49e4dcd65abe40c8b62b0b403e5b0df.tar.gz
elgg-4864f1d5b49e4dcd65abe40c8b62b0b403e5b0df.tar.bz2
Non-invasive fix for previous.
git-svn-id: https://code.elgg.org/elgg/trunk@561 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/filestore.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 9cd981128..a5d381fbc 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -537,7 +537,8 @@
// Resize and return the image contents!
imagecopyresized($newimage, $oldimage, 0,0,0,0,$newwidth,$newheight,$width,$height);
- return imagejpeg($newimage);
+ imagejpeg($newimage, $_FILES[$input_name]['tmp_name'] . $newwidth . $newheight . ".tmp", 90);
+ return file_get_contents($_FILES[$input_name]['tmp_name'] . $newwidth . $newheight . ".tmp");
}