Skip to content

Commit 1953e29

Browse files
committed
Merge pull request blueimp#1409 from Wurzel3/master
Missing argument 6 for UploadHandler::handle_file_upload()
2 parents 08f482c + 7f70267 commit 1953e29

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/php/upload.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ protected function orient_image($file_path) {
267267
return false;
268268
}
269269
$orientation = intval(@$exif['Orientation']);
270-
if (!in_array($orientation, array(3, 6, 8))) {
270+
if (!in_array($orientation, array(3, 6, 8))) {
271271
return false;
272272
}
273273
$image = @imagecreatefromjpeg($file_path);
@@ -290,7 +290,7 @@ protected function orient_image($file_path) {
290290
return $success;
291291
}
292292

293-
protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index) {
293+
protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null) {
294294
$file = new stdClass();
295295
$file->name = $this->trim_file_name($name, $type, $index);
296296
$file->size = intval($size);

0 commit comments

Comments
 (0)