summaryrefslogtreecommitdiff
path: root/FS/FS/part_event_condition.pm
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2014-06-11 15:18:59 -0700
committerMark Wells <mark@freeside.biz>2014-06-11 15:18:59 -0700
commit6b28d0bd4b422d0fff32b559d0785665b1c46b27 (patch)
treed24d5bf2f2ab9560a0690b5550a58da0deab51f8 /FS/FS/part_event_condition.pm
parentc16ef0145a0049c3f20377e2c5076087e999cde0 (diff)
always pass the "time" parameter to join_conditions_sql, related to #28978
Diffstat (limited to 'FS/FS/part_event_condition.pm')
-rw-r--r--FS/FS/part_event_condition.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/FS/FS/part_event_condition.pm b/FS/FS/part_event_condition.pm
index b51c6b9..ac2ee82 100644
--- a/FS/FS/part_event_condition.pm
+++ b/FS/FS/part_event_condition.pm
@@ -243,16 +243,17 @@ sub all_conditionnames {
keys %conditions
}
-=item join_conditions_sql [ EVENTTABLE ]
+=item join_conditions_sql [ EVENTTABLE [, OPTIONS ] ]
Returns an SQL fragment selecting joining all condition options for an event as
tables titled "cond_I<conditionname>". Typically used in conjunction with
-B<where_conditions_sql>.
+B<where_conditions_sql>. OPTIONS should include 'time', the time to use
+in testing event conditions.
=cut
sub join_conditions_sql {
- my ( $class, $eventtable ) = @_;
+ my ( $class, $eventtable, %options ) = @_;
join(' ',
map {
@@ -261,7 +262,7 @@ sub join_conditions_sql {
" AND cond_$_.conditionname = ". dbh->quote($_).
" )";
}
- map $_->[0], $class->_where_conditions( $eventtable ) #, %options )
+ map $_->[0], $class->_where_conditions( $eventtable, %options )
);