From 1693d2bed532d9cb2289e37c8122e2945d159468 Mon Sep 17 00:00:00 2001 From: flynsarmy Date: Sun, 27 Jul 2014 21:55:54 +1000 Subject: [PATCH 1/3] Don't allow [ or ] characters in field IDs --- modules/backend/classes/WidgetBase.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 17bb1d65f..886ba2b52 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -131,6 +131,8 @@ abstract class WidgetBase if ($suffix !== null) $id .= '-' . $suffix; + $id = str_replace(['[', ']'], '__', $id); + return $id; } @@ -248,4 +250,4 @@ abstract class WidgetBase Session::forget($sessionId); } -} \ No newline at end of file +} From 10d30fcd9efc7f50a03f89e0065c7233604451c4 Mon Sep 17 00:00:00 2001 From: flynsarmy Date: Sun, 27 Jul 2014 22:04:24 +1000 Subject: [PATCH 2/3] Spaces, not tabs --- modules/backend/classes/WidgetBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 886ba2b52..3d525a61c 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -131,7 +131,7 @@ abstract class WidgetBase if ($suffix !== null) $id .= '-' . $suffix; - $id = str_replace(['[', ']'], '__', $id); + $id = str_replace(['[', ']'], '__', $id); return $id; } From c6aca8cd18fe73d9fbad7bf48b3a5dc3beb5f8c4 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Mon, 28 Jul 2014 08:23:22 +1000 Subject: [PATCH 3/3] Align [] replacement with FormField --- modules/backend/classes/WidgetBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 3d525a61c..39d7a9421 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -131,7 +131,7 @@ abstract class WidgetBase if ($suffix !== null) $id .= '-' . $suffix; - $id = str_replace(['[', ']'], '__', $id); + $id = rtrim(str_replace(['[', ']'], '-', $id), '-'); return $id; }