From: <jon...@us...> - 2013-01-29 11:01:05
|
Revision: 44666 http://sourceforge.net/p/tikiwiki/code/44666 Author: jonnybradley Date: 2013-01-29 11:01:00 +0000 (Tue, 29 Jan 2013) Log Message: ----------- [FIX] filegals: Don't delete the file after resizing if using the filesystem (thanks Xavi) Modified Paths: -------------- trunk/lib/filegals/filegallib.php Modified: trunk/lib/filegals/filegallib.php =================================================================== --- trunk/lib/filegals/filegallib.php 2013-01-29 00:00:39 UTC (rev 44665) +++ trunk/lib/filegals/filegallib.php 2013-01-29 11:01:00 UTC (rev 44666) @@ -3309,13 +3309,12 @@ $feedback_message = sprintf(tra('Image was reduced: %s x %s -> %s x %s'), $image_x, $image_y, (int)$image_new_x, (int)$image_new_y); $dataforsize = file_get_contents($work_file); $size = function_exists('mb_strlen') ? mb_strlen($dataforsize, '8bit') : strlen($dataforsize); + $metadata = $this->extractMetadataJson($work_file); - if ($data) { + if ($data) { // image stored in $data so the file $work_file is temporary $data = $dataforsize; + unlink($work_file); // otherwise it's the actual filesystem version of the image so should not be deleted } - - $metadata = $this->extractMetadataJson($work_file); - unlink($work_file); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |