From c0b35ded15c8435984ba896abf54f1376f34fa85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 4 Dec 2019 21:39:56 +0100 Subject: [PATCH 1/2] Update cronjob.class.php fk_user_author and fk_user_mod are int --- htdocs/cron/class/cronjob.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index dbf35be905b..245026ab2fb 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -821,8 +821,8 @@ class Cronjob extends CommonObject $this->frequency=''; $this->status=0; $this->processing=0; - $this->fk_user_author=''; - $this->fk_user_mod=''; + $this->fk_user_author=0; + $this->fk_user_mod=0; $this->note=''; $this->nbrun=''; $this->maxrun=100; From 327cf29b41f93ef5651ae055662656d24552d2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 4 Dec 2019 21:42:24 +0100 Subject: [PATCH 2/2] Update images.lib.php --- htdocs/core/lib/images.lib.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index fa68301a298..da1abe47268 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -325,7 +325,6 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95) if (function_exists('exif_read_data') ) { $exif = exif_read_data($fileSource); if ($exif && isset($exif['Orientation'])) { - $infoImg = getimagesize($fileSource); // Get image infos $orientation = $exif['Orientation']; @@ -357,7 +356,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95) } } // then rewrite the rotated image back to the disk as $fileDest - if($fileDest === false){ + if ($fileDest === false){ return $img; } else