Skip to content

EspoCRM – Open Source CRM Application

Fix URL field encoding

Yurii673d623967f6
diff --git a/client/src/views/fields/url-multiple.ts b/client/src/views/fields/url-multiple.ts
index 5ba0450fbb..2922f8348c 100644
--- a/client/src/views/fields/url-multiple.ts
+++ b/client/src/views/fields/url-multiple.ts
@@ -68,9 +68,11 @@ class UrlMultipleFieldView<
}
try {
- if (value === decodeURI(value)) {
- value = encodeURI(value);
+ if (decodeURIComponent(value) !== value) {
+ return value;
}
+
+ value = encodeURI(value);
} catch (e) {
console.warn(`Malformed URI ${value}.`);
}
diff --git a/client/src/views/fields/url.ts b/client/src/views/fields/url.ts
index 09c31b69c5..f9fbfea5f9 100644
--- a/client/src/views/fields/url.ts
+++ b/client/src/views/fields/url.ts
@@ -148,9 +148,11 @@ class UrlFieldView<
}
try {
- if (value === decodeURI(value)) {
- value = encodeURI(value);
+ if (decodeURIComponent(value) !== value) {
+ return value;
}
+
+ value = encodeURI(value);
} catch (e) {
console.warn(`Malformed URI ${value}.`);