projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix one-time charge quantities &
[freeside.git]
/
FS
/
FS
/
svc_domain.pm
diff --git
a/FS/FS/svc_domain.pm
b/FS/FS/svc_domain.pm
index
37128a0
..
47aa8f3
100644
(file)
--- a/
FS/FS/svc_domain.pm
+++ b/
FS/FS/svc_domain.pm
@@
-6,9
+6,10
@@
use vars qw( @ISA $whois_hack $conf
$soarefresh $soaretry
);
use Carp;
$soarefresh $soaretry
);
use Carp;
+use Scalar::Util qw( blessed );
use Date::Format;
#use Net::Whois::Raw;
use Date::Format;
#use Net::Whois::Raw;
-use Net::Domain::TLD;
+use Net::Domain::TLD
qw(tld_exists)
;
use FS::Record qw(fields qsearch qsearchs dbh);
use FS::Conf;
use FS::svc_Common;
use FS::Record qw(fields qsearch qsearchs dbh);
use FS::Conf;
use FS::svc_Common;
@@
-289,10
+290,11
@@
returns the error, otherwise returns false.
=cut
sub replace {
=cut
sub replace {
- my
( $new, $old ) = ( shift, shift )
;
+ my
$new = shift
;
- # We absolutely have to have an old vs. new record to make this work.
- $old = $new->replace_old unless defined($old);
+ my $old = ( blessed($_[0]) && $_[0]->isa('FS::Record') )
+ ? shift
+ : $new->replace_old;
return "Can't change domain - reorder."
if $old->getfield('domain') ne $new->getfield('domain');
return "Can't change domain - reorder."
if $old->getfield('domain') ne $new->getfield('domain');