Merge branch 'patch-2' of https://github.com/gjones2/Freeside (fix closing </SELECT...

[freeside.git] / FS / FS / part_event / Condition.pm

diff --git a/FS/FS/part_event/Condition.pm b/FS/FS/part_event/Condition.pm
index 3275197..fc69f1d 100644 (file)
--- a/FS/FS/part_event/Condition.pm
+++ b/FS/FS/part_event/Condition.pm
@@ -360,10 +360,10 @@ sub condition_sql_option_option {
 
 }
 
-#used for part_event/Condition/cust_bill_has_service.pm
+#used for part_event/Condition/cust_bill_has_service.pm and has_cust_tag.pm
 #a little false laziness w/above and condition_sql_option_integer
 sub condition_sql_option_option_integer {
-  my( $class, $option, $driver_name ) = @_;
+  my( $class, $option ) = @_;
 
   ( my $condname = $class ) =~ s/^.*:://;
 
@@ -375,7 +375,7 @@ sub condition_sql_option_option_integer {
           AND part_event_condition_option.optionvalue = 'HASH'
      )";
 
-  my $integer = ($driver_name =~ /^mysql/) ? 'UNSIGNED INTEGER' : 'INTEGER';
+  my $integer = (driver_name =~ /^mysql/) ? 'UNSIGNED INTEGER' : 'INTEGER';
 
   my $optionname = "CAST(optionname AS $integer)";