diff options
| -rw-r--r-- | Bugzilla/Search.pm | 3 | ||||
| -rwxr-xr-x | collectstats.pl | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index 09c47d471..3a211e078 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -58,6 +58,7 @@ sub init { my $self = shift; my $fieldsref = $self->{'fields'}; my $params = $self->{'params'}; + my $user = $self->{'user'} || Bugzilla->user; my $debug = 0; @@ -991,8 +992,6 @@ sub init { # Make sure we create a legal SQL query. @andlist = ("1 = 1") if !@andlist; - my $user = Bugzilla->user; - my $query = "SELECT " . join(', ', @fields) . " FROM $suppstring" . " LEFT JOIN bug_group_map " . diff --git a/collectstats.pl b/collectstats.pl index 42f8e682e..5c1f6d499 100755 --- a/collectstats.pl +++ b/collectstats.pl @@ -441,7 +441,7 @@ sub CollectSeriesData { CleanupChartTables() if ($days_since_epoch % 7 == 0); my $dbh = Bugzilla->dbh; - my $serieses = $dbh->selectall_hashref("SELECT series_id, query " . + my $serieses = $dbh->selectall_hashref("SELECT series_id, query, creator " . "FROM series " . "WHERE frequency != 0 AND " . "($days_since_epoch + series_id) % frequency = 0", @@ -455,12 +455,12 @@ sub CollectSeriesData { foreach my $series_id (keys %$serieses) { # We set up the user for Search.pm's permission checking - each series # runs with the permissions of its creator. - $::vars->{'user'} = - new Bugzilla::User($serieses->{$series_id}->{'creator'}); + my $user = new Bugzilla::User($serieses->{$series_id}->{'creator'}); my $cgi = new Bugzilla::CGI($serieses->{$series_id}->{'query'}); my $search = new Bugzilla::Search('params' => $cgi, - 'fields' => ["bugs.bug_id"]); + 'fields' => ["bugs.bug_id"], + 'user' => $user); my $sql = $search->getSQL(); # We need to count the returned rows. Without subselects, we can't |