Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

main/inc/lib/extra_field_value.lib.php

@@ -875,13 +875,11 @@ class ExtraFieldValue extends Model
     {
         $field_id = intval($field_id);
         $item_id = intval($item_id);
-        $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $sql = "DELETE FROM {$this->table}
                 WHERE
                     item_id = '$item_id' AND
-                    field_id = '$field_id' AND
+                    field_id = '$field_id'
-                    extra_field_type = $extraFieldType
                 ";
         Database::query($sql);
     }