X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg.pm;h=8f003047a84e004dfde5dde4d44d4cf3a59bc6db;hp=45bdc62077b33ab4756f920710de562623496a51;hb=747fc5e700ae36409be707b202c574a9b15d4c70;hpb=dc213442f13860d5f44ff7ea0df4eeaf1881d64f

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 45bdc6207..8f003047a 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1416,9 +1416,8 @@ sub option {
   my( $self, $opt, $ornull ) = @_;
 
   #cache: was pulled up in the original part_pkg query
-  if ( $opt =~ /^(setup|recur)_fee$/ && defined($self->hashref->{"_$opt"}) ) {
-    return $self->hashref->{"_$opt"};
-  }
+  return $self->hashref->{"_opt_$opt"}
+    if exists $self->hashref->{"_opt_$opt"};
 
   cluck "$self -> option: searching for $opt" if $DEBUG;
   my $part_pkg_option =