From 0cce4a1d4ac36ac0d30f7471e113b27a605f9a4f Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 19 Feb 2008 00:31:24 +0000 Subject: [PATCH] Merged revisions 43342 via svnmerge from svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2 ........ r43342 | hsmith | 2007-10-12 13:57:25 +1300 (Fri, 12 Oct 2007) | 1 line Used Object::create() to create email instances sent by the system. ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49783 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- security/Member.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/security/Member.php b/security/Member.php index bec9b8b88..5ffed1e4d 100644 --- a/security/Member.php +++ b/security/Member.php @@ -226,13 +226,13 @@ class Member extends DataObject { function sendInfo($type = 'signup', $data = null) { switch($type) { case "signup": - $e = new Member_SignupEmail(); + $e = Object::create('Member_SignupEmail'); break; case "changePassword": - $e = new Member_ChangePasswordEmail(); + $e = Object::create('Member_ChangePasswordEmail'); break; case "forgotPassword": - $e = new Member_ForgotPasswordEmail(); + $e = Object::create('Member_ForgotPasswordEmail'); break; } @@ -1163,10 +1163,6 @@ class Member_ChangePasswordEmail extends Email_Template { function __construct() { $this->subject = _t('Member.SUBJECTPASSWORDCHANGED', "Your password has been changed", PR_MEDIUM, 'Email subject'); } - - function BaseHref() { - return 'http://'.(($subsite = Subsite::currentSubsite()) ? $subsite->domain() : Subsite::default_domain()).'/'; - } }