summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xeditflagtypes.cgi1
-rw-r--r--template/en/default/global/user-error.html.tmpl3
2 files changed, 3 insertions, 1 deletions
diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index 8b51be326..a48dc7578 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -444,6 +444,7 @@ sub validateID {
sub validateName {
$::FORM{'name'}
+ && $::FORM{'name'} !~ /[ ,]/
&& length($::FORM{'name'}) <= 50
|| ThrowUserError("flag_type_name_invalid", { name => $::FORM{'name'} });
}
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c92824ad3..79861b5f0 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -342,7 +342,8 @@
[% ELSIF error == "flag_type_name_invalid" %]
[% title = "Flag Type Name Invalid" %]
- The name <em>[% name FILTER html %]</em> must be 1-50 characters long.
+ The name <em>[% name FILTER html %]</em> must be 1-50 characters long
+ and must not contain any spaces or commas.
[% ELSIF error == "flag_update_denied" %]
[% title = "Flag Modification Denied" %]