diff options
| -rw-r--r-- | Bugzilla/User.pm | 2 | ||||
| -rwxr-xr-x | collectstats.pl | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 847319c18..494876b31 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -1078,7 +1078,7 @@ sub wants_mail { } my $wants_mail = - $dbh->selectrow_array("SELECT * + $dbh->selectrow_array("SELECT 1 FROM email_setting WHERE user_id = $self->{'id'} AND relationship = $relationship diff --git a/collectstats.pl b/collectstats.pl index eca072e61..a12c85586 100755 --- a/collectstats.pl +++ b/collectstats.pl @@ -181,11 +181,11 @@ FIN } sub calculate_dupes { - SendSQL("SELECT * FROM duplicates"); + my $dbh = Bugzilla->dbh; + my $rows = $dbh->selectall_arrayref("SELECT dupe_of, dupe FROM duplicates"); my %dupes; my %count; - my @row; my $key; my $changed = 1; @@ -203,9 +203,8 @@ sub calculate_dupes { # Create a hash with key "a bug number", value "bug which that bug is a # direct dupe of" - straight from the duplicates table. - while (@row = FetchSQLData()) { - my $dupe_of = shift @row; - my $dupe = shift @row; + foreach my $row (@$rows) { + my ($dupe_of, $dupe) = @$row; $dupes{$dupe} = $dupe_of; } |