diff options
| author | olav%bkor.dhs.org <> | 2006-10-21 01:56:25 +0200 |
|---|---|---|
| committer | olav%bkor.dhs.org <> | 2006-10-21 01:56:25 +0200 |
| commit | c2f38f17cfa3aad8a13ee6eb02944b52d9e79037 (patch) | |
| tree | 0ad5cc9691700db94e4f2df94e7a3ecdefc42c55 | |
| parent | ea199cfceb3b847c3f136ebc91ca35643009c1c6 (diff) | |
| download | bugzilla-c2f38f17cfa3aad8a13ee6eb02944b52d9e79037.tar.gz bugzilla-c2f38f17cfa3aad8a13ee6eb02944b52d9e79037.tar.xz | |
Bug 357005: 'cf_' should not be allowed as a custom field name
Patch by Olav Vitters <olav@bkor.dhs.org> r=LpSolit a=myk
| -rw-r--r-- | editfields.cgi | 4 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/editfields.cgi b/editfields.cgi index a77aafe77..f7a059016 100644 --- a/editfields.cgi +++ b/editfields.cgi @@ -63,8 +63,8 @@ elsif ($action eq 'new') { # Validate these fields. $name || ThrowUserError('customfield_missing_name'); # Don't want to allow a name that might mess up SQL. - $name =~ /^\w+$/ || ThrowUserError('customfield_invalid_name', - { name => $name }); + $name =~ /^\w+$/ && $name ne "cf_" + || ThrowUserError('customfield_invalid_name', { name => $name }); # Prepend cf_ to the custom field name to distinguish it from standard fields. if ($name !~ /^cf_/) { $name = 'cf_' . $name; diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index bd3f29e11..eebefa927 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -319,7 +319,8 @@ [% ELSIF error == "customfield_invalid_name" %] [% title = "Invalid Custom Field Name" %] '[% name FILTER html %]' is not a valid name for a custom field. - A name may contain only letters, numbers, and the underscore character. + A name may contain only letters, numbers, and the underscore character. The + name should also be different from 'cf_'. [% ELSIF error == "customfield_nonexistent" %] [% title = "Unknown Custom Field" %] |