diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 8f005c0f0d7..4008a3cd7be 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -172,13 +172,13 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 // Show message
 $message = '';
 $url = '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank">'.$urlwithroot.'/dav/fileserver.php</a>';
-$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV', $url);
+$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV', '{url}'));
 $message .= '<br>';
 if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
 {
 	$urlEntity = (!empty($conf->multicompany->enabled) ? '?entity='.$conf->entity : '');
 	$url = '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank">'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'</a>';
-	$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV public', $url);
+	$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV public', '{url}'));
 	$message .= '<br>';
 }
 print $message;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d701da55d8f..bdca5f74d0a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3671,7 +3671,9 @@ abstract class CommonObject
 	 */
 	static public function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)
 	{
-		if(empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
+		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
+			return -1;
+		}
 
 		global $db;
 
@@ -3686,7 +3688,6 @@ abstract class CommonObject
 		}
 
 		return $TRes;
-
 	}
 
 	/**
@@ -3698,7 +3699,7 @@ abstract class CommonObject
 	 */
 	static public function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
 	{
-		if(empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
+		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
 
 		global $db;
 
@@ -3708,7 +3709,6 @@ abstract class CommonObject
 		if (empty($resql)) return 0;
 
 		return 1;
-
 	}
 
 	/**