diff options
| author | David Lawrence <dlawrence@mozilla.com> | 2011-10-05 00:27:16 +0200 |
|---|---|---|
| committer | David Lawrence <dlawrence@mozilla.com> | 2011-10-05 00:27:16 +0200 |
| commit | 8592e84f5d251a284f09fae2947101715e094a78 (patch) | |
| tree | d40c32380d4253f38df2a50cc5b52b6f1e4cc4e4 /Bugzilla | |
| parent | 57584dc4744fea59833ef355f7513690d246c70f (diff) | |
| parent | 763a930131864bedd3155b668fcd8fd0fce2fefc (diff) | |
| download | bugzilla-8592e84f5d251a284f09fae2947101715e094a78.tar.gz bugzilla-8592e84f5d251a284f09fae2947101715e094a78.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Attachment.pm | 9 | ||||
| -rw-r--r-- | Bugzilla/User.pm | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index a39dc3af4..3a8e7d5d5 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -565,7 +565,14 @@ sub _check_filename { my ($invocant, $filename) = @_; $filename = clean_text($filename); - $filename || ThrowUserError('file_not_specified'); + if (!$filename) { + if (ref $invocant) { + ThrowUserError('filename_not_specified'); + } + else { + ThrowUserError('file_not_specified'); + } + } # Remove path info (if any) from the file name. The browser should do this # for us, but some are buggy. This may not work on Mac file names and could diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 8ad84cec7..c4a042cf6 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -2489,12 +2489,6 @@ Returns true if the user wants mail for a given set of events. This method is more general than C<wants_bug_mail>, allowing you to check e.g. permissions for flag mail. -=item C<is_mover> - -Returns true if the user is in the list of users allowed to move bugs -to another database. Note that this method doesn't check whether bug -moving is enabled. - =item C<is_insider> Returns true if the user can access private comments and attachments, |