moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-70968-311' of git://github.com/marinaglancy/moodle into MOODLE_311_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-03-18 00:29:46 +01:00
commit d42107e093
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/gdlib.php
View file

@ -233,6 +233,14 @@ function process_new_icon($context, $component, $filearea, $itemid, $originalfil
$icon = array('contextid'=>$context->id, 'component'=>$component, 'filearea'=>$filearea, 'itemid'=>$itemid, 'filepath'=>'/');
if ($imagefnc === 'imagejpeg') {
// Function imagejpeg() accepts less arguments than imagepng() but we need to make $imagefnc accept the same
// number of arguments, otherwise PHP8 throws an error.
$imagefnc = function($image, $filename, $quality, $unused) {
return imagejpeg($image, $filename, $quality);
};
}
ob_start();
if (!$imagefnc($im1, NULL, $quality, $filters)) {
// keep old icons
@ -384,6 +392,14 @@ function resize_image_from_image($original, $imageinfo, $width, $height, $forcec
imagecopybicubic($newimage, $original, $dstx, $dsty, 0, 0, $targetwidth, $targetheight, $originalwidth, $originalheight);
if ($imagefnc === 'imagejpeg') {
// Function imagejpeg() accepts less arguments than imagepng() but we need to make $imagefnc accept the same
// number of arguments, otherwise PHP8 throws an error.
$imagefnc = function($image, $filename, $quality, $unused) {
return imagejpeg($image, $filename, $quality);
};
}
// Capture the image as a string object, rather than straight to file.
ob_start();
if (!$imagefnc($newimage, null, $quality, $filters)) {