diff --git a/modules/backend/classes/FilterScope.php b/modules/backend/classes/FilterScope.php index f836e2ff1..6989aa376 100644 --- a/modules/backend/classes/FilterScope.php +++ b/modules/backend/classes/FilterScope.php @@ -140,8 +140,7 @@ class FilterScope if ($this->idPrefix) $id = $this->idPrefix . '-' . $id; - $id = rtrim(str_replace(['[', ']'], '-', $id), '-'); - return $id; + return Str::evalHtmlId($id); } } \ No newline at end of file diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php index 267b78bc0..f9804e927 100644 --- a/modules/backend/classes/FormField.php +++ b/modules/backend/classes/FormField.php @@ -285,7 +285,6 @@ class FormField if ($this->idPrefix) $id = $this->idPrefix . '-' . $id; - $id = rtrim(str_replace(['[', ']'], '-', $id), '-'); - return $id; + return Str::evalHtmlId($id); } } \ No newline at end of file diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 39d7a9421..3c05e776a 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -131,9 +131,7 @@ abstract class WidgetBase if ($suffix !== null) $id .= '-' . $suffix; - $id = rtrim(str_replace(['[', ']'], '-', $id), '-'); - - return $id; + return Str::evalHtmlId($id); } /**