diff --git a/security/Member.php b/security/Member.php index e248ef751..bc08b48ce 100644 --- a/security/Member.php +++ b/security/Member.php @@ -1021,17 +1021,13 @@ class Member_SignupEmail extends Email_Template { <% end_if %> - <% if DriversLicense5A %> -
  • Drivers License: $DriversLicense5A<% if DriversLicense5B %> - $DriversLicense5B <% end_if %>
  • - <% end_if %> - '; function MemberData() { return $this->template_data->listOfFields( "FirstName", "Surname", "Email", "Phone", "Mobile", "Street", - "Suburb", "City", "Postcode", "DriversLicense5A", "DriversLicense5B" + "Suburb", "City", "Postcode" ); } } @@ -1090,7 +1086,7 @@ class Member_UnsubscribeRecord extends DataObject { ? $member : $member->ID; - $this->NewsletterTypeID = (is_numeric($newletterType)) + $this->NewsletterTypeID = (is_numeric($newsletterType)) ? $newsletterType : $newsletterType->ID;