From df4de0f495c13aff9ddcb3896cbd577e63ec7965 Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 17 Oct 2013 10:43:22 +0000
Subject: [PATCH] Bug 927736: "invalid token" error if someone else changes the
 CC list while viewing a bug r/a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@265067 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev         | 2 +-
 mozilla/webtools/bugzilla/process_bug.cgi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index ff0efa8b66a..23aec72401a 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8782
\ No newline at end of file
+8783
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index 19880fe7dd3..2bcfca6d512 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/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');