diff options
| author | ivan <ivan> | 2010-03-26 02:28:06 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-03-26 02:28:06 +0000 |
| commit | 612b84df6c0e6e0468477a6c57a59449285e2140 (patch) | |
| tree | abe0bf9854259dac9ad272b65e6179b23c807d65 | |
| parent | 4d2208098eebb3bc9a4ea882d1d0403b4e04359d (diff) | |
fix mailinglistmember.pm dependency on contact_email.pm from 2.1 branch, RT#7897
| -rw-r--r-- | FS/FS/Schema.pm | 3 | ||||
| -rw-r--r-- | FS/FS/mailinglistmember.pm | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 8cadaa76c..dde4053e6 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2585,12 +2585,11 @@ sub tables_hashref { 'membernum', 'serial', '', '', '', '', 'listnum', 'int', '', '', '', '', 'svcnum', 'int', 'NULL', '', '', '', - 'contactemailnum', 'int', 'NULL', '', '', '', 'email', 'varchar', 'NULL', 255, '', '', ], 'primary_key' => 'membernum', 'unique' => [], - 'index' => [['listnum'],['svcnum'],['contactemailnum'],['email']], + 'index' => [['listnum'],['svcnum'],['email']], }, diff --git a/FS/FS/mailinglistmember.pm b/FS/FS/mailinglistmember.pm index 49688d812..8655d61b2 100644 --- a/FS/FS/mailinglistmember.pm +++ b/FS/FS/mailinglistmember.pm @@ -6,7 +6,6 @@ use Scalar::Util qw( blessed ); use FS::Record qw( dbh qsearchs ); # qsearch ); use FS::mailinglist; use FS::svc_acct; -use FS::contact_email; =head1 NAME @@ -47,10 +46,6 @@ listnum svcnum -=item contactemailnum - -contactemailnum - =item email email @@ -193,7 +188,6 @@ sub check { $self->ut_numbern('membernum') || $self->ut_foreign_key('listnum', 'mailinglist', 'listnum') || $self->ut_foreign_keyn('svcnum', 'svc_acct', 'svcnum') - || $self->ut_foreign_keyn('contactemailnum', 'contact_email', 'contactemailnum') || $self->ut_textn('email') #XXX ut_email! from svc_forward, cust_main_invoice ; return $error if $error; @@ -216,7 +210,7 @@ sub mailinglist { sub email_address { my $self = shift; - #XXX svcnum, contactemailnum + #XXX svcnum $self->email; } |