diff options
author | David Lawrence <dlawrence@mozilla.com> | 2011-08-22 19:21:08 +0200 |
---|---|---|
committer | David Lawrence <dlawrence@mozilla.com> | 2011-08-22 19:21:08 +0200 |
commit | 9344a458c830ba066b9004c301d0fc6cabc8f229 (patch) | |
tree | ff06e420d70da1459af478c2619fb18900591d5c /Bugzilla/Bug.pm | |
parent | f30b939630917a63bc733e3963869643eeccdc90 (diff) | |
parent | dd7eacbef2571efe55e5b18d80e93837dc6619d1 (diff) | |
download | bugzilla-9344a458c830ba066b9004c301d0fc6cabc8f229.tar.gz bugzilla-9344a458c830ba066b9004c301d0fc6cabc8f229.tar.xz |
merged with bugzilla/4.2
Diffstat (limited to 'Bugzilla/Bug.pm')
-rw-r--r-- | Bugzilla/Bug.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 40bf3af2e..6fdab3645 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -554,8 +554,8 @@ sub possible_duplicates { FROM bugs INNER JOIN bugs_fulltext ON bugs.bug_id = bugs_fulltext.bug_id WHERE ($where_sql) $product_sql - ORDER BY relevance DESC, bug_id DESC - LIMIT $sql_limit", {Slice=>{}}); + ORDER BY relevance DESC, bug_id DESC " . + $dbh->sql_limit($sql_limit), {Slice=>{}}); my @actual_dupe_ids; # Resolve duplicates into their ultimate target duplicates. @@ -1217,6 +1217,8 @@ sub send_changes { sub _send_bugmail { my ($params, $vars) = @_; + require Bugzilla::BugMail; + my $results = Bugzilla::BugMail::Send($params->{'id'}, $params->{'forced'}, $params); |