projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9dceb6f
)
fix fallout from NG auth changes, RT#21563
author
Ivan Kohler
<ivan@freeside.biz>
Thu, 30 Jan 2014 05:51:33 +0000
(21:51 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Thu, 30 Jan 2014 05:51:33 +0000
(21:51 -0800)
FS/FS/access_user.pm
patch
|
blob
|
history
diff --git
a/FS/FS/access_user.pm
b/FS/FS/access_user.pm
index
0a441c4
..
41fcd1e
100644
(file)
--- a/
FS/FS/access_user.pm
+++ b/
FS/FS/access_user.pm
@@
-2,7
+2,7
@@
package FS::access_user;
use base qw( FS::m2m_Common FS::option_Common );
use strict;
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;
use FS::UID;
use FS::Auth;
use FS::Conf;
@@
-456,7
+456,7
@@
sub default_customer_view {
my $self = shift;
$self->option('default_customer_view')
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
}
|| 'basics'; #s/jumbo/basics/ starting with 3.0
}
@@
-491,7
+491,7
@@
sub spreadsheet_format {
my $f = $override
|| $self->option('spreadsheet_format')
my $f = $override
|| $self->option('spreadsheet_format')
- ||
$conf
->config('spreadsheet_format')
+ ||
FS::Conf->new
->config('spreadsheet_format')
|| 'XLS';
$formats{$f};
|| 'XLS';
$formats{$f};