1 files changed, 6 insertions, 2 deletions

diff --git a/chart.cgi b/chart.cgi
index 1aef2a251..0b46347b5 100755
--- a/chart.cgi
+++ b/chart.cgi
@@ -65,6 +65,12 @@ local our $template = Bugzilla->template;
 local our $vars = {};
 my $dbh = Bugzilla->dbh;
 
+my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+if (!Bugzilla->feature('new_charts')) {
+    ThrowCodeError('feature_disabled', { feature => 'new_charts' });
+}
+
 # Go back to query.cgi if we are adding a boolean chart parameter.
 if (grep(/^cmd-/, $cgi->param())) {
     my $params = $cgi->canonicalise_query("format", "ctype", "action");
@@ -96,8 +102,6 @@ if ($action eq "search") {
     exit;
 }
 
-my $user = Bugzilla->login(LOGIN_REQUIRED);
-
 $user->in_group(Bugzilla->params->{"chartgroup"})
   || ThrowUserError("auth_failure", {group  => Bugzilla->params->{"chartgroup"},
                                      action => "use",