use base qw( FS::m2m_Common FS::option_Common );
use strict;
-use vars qw( $DEBUG $me $conf );
+use vars qw( $DEBUG $me );
use FS::UID;
use FS::Auth;
use FS::Conf;
unless ( grep !exists($self->{_ACLcache}{$_}), @$rightname ) {
warn "$me ACL cache hit for ". join(', ', @$rightname). "\n"
if $DEBUG;
- return grep $self->{_ACLcache}{$_}, @$rightname
+ return scalar( grep $self->{_ACLcache}{$_}, @$rightname );
}
warn "$me ACL cache miss for ". join(', ', @$rightname). "\n"
my $self = shift;
$self->option('default_customer_view')
- || $conf->config('cust_main-default_view')
+ || FS::Conf->new->config('cust_main-default_view')
|| 'basics'; #s/jumbo/basics/ starting with 3.0
}
my $f = $override
|| $self->option('spreadsheet_format')
- || $conf->config('spreadsheet_format')
+ || FS::Conf->new->config('spreadsheet_format')
|| 'XLS';
$formats{$f};