diff options
-rwxr-xr-x | editkeywords.cgi | 4 | ||||
-rwxr-xr-x | sanitycheck.cgi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editkeywords.cgi b/editkeywords.cgi index 72fe78bf0..3443a5c3f 100755 --- a/editkeywords.cgi +++ b/editkeywords.cgi @@ -88,8 +88,8 @@ sub Validate ($$) { PutTrailer($localtrailer); exit; } - if ($name =~ /,/) { - print "You may not use commas in a keyword name.\n"; + if ($name =~ /[\s,]/) { + print "You may not use commas or whitespace in a keyword name.\n"; print "Please press <b>Back</b> and try again.\n"; PutTrailer($localtrailer); exit; diff --git a/sanitycheck.cgi b/sanitycheck.cgi index 33890be78..08fbbfb8f 100755 --- a/sanitycheck.cgi +++ b/sanitycheck.cgi @@ -234,7 +234,7 @@ while (@row = FetchSQLData()) { Alert("Duplicate entry in keyworddefs for id $id"); } $keywordids{$id} = 1; - if ($name =~ /,/ || $name =~ /^\s/ || $name =~ /\s$/) { + if ($name =~ /[\s,]/) { Alert("Bogus name in keyworddefs for id $id"); } } |