diff options
author | Byron Jones <glob@mozilla.com> | 2013-10-17 12:29:39 +0200 |
---|---|---|
committer | Frédéric Buclin <LpSolit@gmail.com> | 2013-10-17 12:29:39 +0200 |
commit | 3c9438b4fb8525bf094b7850423a140eeefcfb60 (patch) | |
tree | 0e88b563cc36a9a7c7813ab34af0308157f42c9c | |
parent | Bug 927570: mid-air conflict fails to check all changed fields (diff) | |
download | bugzilla-3c9438b4fb8525bf094b7850423a140eeefcfb60.tar.gz bugzilla-3c9438b4fb8525bf094b7850423a140eeefcfb60.tar.bz2 bugzilla-3c9438b4fb8525bf094b7850423a140eeefcfb60.zip |
Bug 927736: "invalid token" error if someone else changes the CC list while viewing a bugrelease-4.4.1bugzilla-4.4.1
r/a=LpSolit
-rwxr-xr-x | process_bug.cgi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/process_bug.cgi b/process_bug.cgi index 4f07507b7..7c8984d40 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -111,7 +111,7 @@ print $cgi->header() unless Bugzilla->usage_mode == USAGE_MODE_EMAIL; # Check for a mid-air collision. Currently this only works when updating # an individual bug. -my $delta_ts = $cgi->param('delta_ts'); +my $delta_ts = $cgi->param('delta_ts') || ''; if ($delta_ts) { my $delta_ts_z = datetime_from($delta_ts) @@ -167,7 +167,7 @@ if ($delta_ts) { my $token = $cgi->param('token'); if ($cgi->param('id')) { - check_hash_token($token, [$first_bug->id, $first_bug->delta_ts]); + check_hash_token($token, [$first_bug->id, $delta_ts]); } else { check_token_data($token, 'buglist_mass_change', 'query.cgi'); |