From e15dcf488f8bbf1fef2cd0a7001385f7a95e8d59 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 17 Aug 2011 00:45:22 +0200
Subject: Bug 678970: Use $user and $cgi instead of Bugzilla->user and
 Bugzilla->cgi r=timello a=LpSolit

---
 colchange.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'colchange.cgi')

diff --git a/colchange.cgi b/colchange.cgi
index 844f7615c..c3741f623 100755
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -53,7 +53,7 @@ use constant COLUMN_CLASSES => {
     'Bugzilla::Keyword' => 'keywords',
 };
 
-Bugzilla->login();
+my $user = Bugzilla->login();
 
 my $cgi = Bugzilla->cgi;
 my $template = Bugzilla->template;
@@ -77,7 +77,7 @@ foreach my $class (keys %{ COLUMN_CLASSES() }) {
     delete $columns->{$column} if !$class->any_exist;
 }
 
-if (!Bugzilla->user->is_timetracker) {
+if (!$user->is_timetracker) {
     foreach my $column (TIMETRACKING_FIELDS) {
         delete $columns->{$column};
     }
@@ -138,7 +138,7 @@ if (defined $cgi->param('rememberedquery')) {
     $vars->{'message'} = "change_columns";
 
     if ($cgi->param('save_columns_for_search')
-        && defined $search && $search->user->id == Bugzilla->user->id) 
+        && defined $search && $search->user->id == $user->id)
     {
         my $params = new Bugzilla::CGI($search->url);
         $params->param('columnlist', join(",", @collist));
@@ -188,7 +188,7 @@ $vars->{'buffer'} = $cgi->query_string();
 
 my $search;
 if (defined $cgi->param('query_based_on')) {
-    my $searches = Bugzilla->user->queries;
+    my $searches = $user->queries;
     my ($search) = grep($_->name eq $cgi->param('query_based_on'), @$searches);
 
     if ($search) {
-- 
cgit v1.2.3-24-g4f1b