summaryrefslogtreecommitdiffstats
path: root/Bugzilla/FlagType.pm
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-07-05 20:43:18 +0200
committerDylan William Hardison <dylan@hardison.net>2017-07-07 00:19:20 +0200
commit37722eca39874bb6abdcd120e3e458bd62dea62b (patch)
tree57a9a9970c00ec77baecab7e154ef7dfcef863fe /Bugzilla/FlagType.pm
parenta6f98de0d4e842351222b0173a1fff151da8738e (diff)
downloadbugzilla-37722eca39874bb6abdcd120e3e458bd62dea62b.tar.gz
bugzilla-37722eca39874bb6abdcd120e3e458bd62dea62b.tar.xz
Bug 1377933 - Remove trailing whitespace from all perl files
Diffstat (limited to 'Bugzilla/FlagType.pm')
-rw-r--r--Bugzilla/FlagType.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index a86db380b..c973ea662 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -648,8 +648,8 @@ sub count {
=item C<sqlify_criteria($criteria, $tables)>
Converts a hash of criteria into a list of SQL criteria.
-$criteria is a reference to the criteria (field => value),
-$tables is a reference to an array of tables being accessed
+$criteria is a reference to the criteria (field => value),
+$tables is a reference to an array of tables being accessed
by the query.
=back
@@ -684,9 +684,9 @@ sub sqlify_criteria {
push(@criteria, "flagtypes.is_active = $is_active");
}
if (exists($criteria->{active_or_has_flags}) && $criteria->{active_or_has_flags} =~ /^\d+$/) {
- push(@$tables, "LEFT JOIN flags AS f ON flagtypes.id = f.type_id " .
+ push(@$tables, "LEFT JOIN flags AS f ON flagtypes.id = f.type_id " .
"AND f.bug_id = " . $criteria->{active_or_has_flags});
- push(@criteria, "(flagtypes.is_active = 1 OR f.id IS NOT NULL)");
+ push(@criteria, "(flagtypes.is_active = 1 OR f.id IS NOT NULL)");
}
if ($criteria->{product_id}) {
my $product_id = $criteria->{product_id};
@@ -698,7 +698,7 @@ sub sqlify_criteria {
# by flag type ID and target product/component.
push(@$tables, "INNER JOIN flaginclusions AS i ON flagtypes.id = i.type_id");
push(@criteria, "(i.product_id = $product_id OR i.product_id IS NULL)");
-
+
# Add exclusions to the query, which is more complicated. First of all,
# we do a LEFT JOIN so we don't miss flag types with no exclusions.
# Then, as with inclusions, we join on flag type ID and target product/