Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/comm/action/class/actioncomm.class.php

@@ -2196,12 +2196,12 @@ class ActionComm extends CommonObject
 						$obj   = $this->db->fetch_object($resql);
 						$event = array();
 
-						if ($obj->halfday == -1) {
+						if ($obj->halfday == 1) {
 							$event['fulldayevent'] = false;
 
 							$timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
 							$timestampEnd   = dol_stringtotime($obj->date_end." 12:00:00", 0);
-						} elseif ($obj->halfday == 1) {
+						} elseif ($obj->halfday == -1) {
 							$event['fulldayevent'] = false;
 
 							$timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);

htdocs/core/tpl/filemanager.tpl.php

@@ -238,10 +238,9 @@ if ($action == 'convertimgwebp' && $permtoadd) {
 	foreach ($filelist as $filename) {
 		$filepath = $filename['fullname'];
 		if (!(substr_compare($filepath, 'webp', -strlen('webp')) === 0)) {
-			if (image_format_supported($filepath) == 1) {
-				$filepathnoext = preg_replace("/\.[a-z0-9]+$/i", "", $filepath);
-
-				if (! dol_is_file($filepathnoext.'.webp')) {	// If file does not exists yet
+			if (!empty($file) || !dol_is_file($filepathnoext.'.webp')) { // If file does not exists yet
+				if (image_format_supported($filepath) == 1) {
+					$filepathnoext = preg_replace("/\.[a-z0-9]+$/i", "", $filepath);
 					$result = dol_imageResizeOrCrop($filepath, 0, 0, 0, 0, 0, $filepathnoext.'.webp', 90);
 					if (!dol_is_file($result)) {
 						$error++;