diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-06-29 13:04:33 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-10-23 16:42:33 -0400 |
| commit | 0ce4dcd4dad9777fe4c6436a3308a81496ae9ac3 (patch) | |
| tree | b11925ad33d37d53290c6aec04b0adee5e1ea88c /FS | |
| parent | ead0cc76f66c0806321443657b49f829034e23ae (diff) | |
RT# 30783 Clean up json code for free_addrs
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/svc_IP_Mixin.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm index 499abb8ac..e0b04c6ab 100644 --- a/FS/FS/svc_IP_Mixin.pm +++ b/FS/FS/svc_IP_Mixin.pm @@ -132,7 +132,7 @@ sub _used_addresses { # parameter to bypass FS::Record objects creation and just # return hashrefs from DBI. 200,000 hashrefs are many seconds faster # than 200,000 FS::Record objects - my %qsearch = ( + my %qsearch_param = ( table => $class->table, select => $ip_field, hashref => \%qsearch, @@ -140,7 +140,8 @@ sub _used_addresses { ); if ( $octets ) { my $block_str = join('.', (split(/\D/, $block_na->first))[0..$octets-1]); - $qsearch{extra_sql} .= " AND $ip_field LIKE ".dbh->quote("${block_str}.%"); + $qsearch_param{extra_sql} + .= " AND $ip_field LIKE ".dbh->quote("${block_str}.%"); } if ( $block->ip_netmask % 8 ) { @@ -154,7 +155,7 @@ sub _used_addresses { return map { $_->$ip_field } - qsearch( \%qsearch ); + qsearch( \%qsearch_param ); } sub _is_used { |