diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 2d421d50a3c..98226715b2f 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7668
\ No newline at end of file
+7669
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/chart.cgi b/mozilla/webtools/bugzilla/chart.cgi
index 12ef8d8345f..a04cde06829 100755
--- a/mozilla/webtools/bugzilla/chart.cgi
+++ b/mozilla/webtools/bugzilla/chart.cgi
@@ -146,6 +146,8 @@ elsif ($action eq "wrap") {
}
elsif ($action eq "create") {
assertCanCreate($cgi);
+ my $token = $cgi->param('token');
+ check_hash_token($token, ['create-series']);
my $series = new Bugzilla::Series($cgi);
@@ -164,9 +166,11 @@ elsif ($action eq "edit") {
edit($series);
}
elsif ($action eq "alter") {
- assertCanEdit($series_id);
+ my $series = assertCanEdit($series_id);
+ my $token = $cgi->param('token');
+ check_hash_token($token, [$series->id, $series->name]);
# XXX - This should be replaced by $series->set_foo() methods.
- my $series = new Bugzilla::Series($cgi);
+ $series = new Bugzilla::Series($cgi);
# We need to check if there is _another_ series in the database with
# our (potentially new) name. So we call existsInDatabase() to see if
diff --git a/mozilla/webtools/bugzilla/template/en/default/reports/edit-series.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/reports/edit-series.html.tmpl
index 9afe7edcd6a..da7d15e0a0a 100644
--- a/mozilla/webtools/bugzilla/template/en/default/reports/edit-series.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/reports/edit-series.html.tmpl
@@ -40,6 +40,8 @@
[% PROCESS reports/series.html.tmpl
button_name = "Change Data Set" %]
+
[% IF default.series_id %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
index 2aa5224c45b..468324abd30 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
@@ -54,6 +54,7 @@
[% PROCESS reports/series.html.tmpl
button_name = "Create Data Set" %]
+