Преглед на файлове

2007-02-26 Igor Zelmanovich <[email protected]>

	* CreateUserWizard.cs: fixed: does not attempt to send email if 
	MailDefinition is not defined.

svn path=/trunk/mcs/; revision=73420
Igor Zelmanovich преди 19 години
родител
ревизия
dee77a109a
променени са 2 файла, в които са добавени 16 реда и са изтрити 9 реда
  1. 5 0
      mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
  2. 11 9
      mcs/class/System.Web/System.Web.UI.WebControls/CreateUserWizard.cs

+ 5 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,8 @@
+2007-02-26 Igor Zelmanovich <[email protected]>
+
+	* CreateUserWizard.cs: fixed: does not attempt to send email if 
+	MailDefinition is not defined.
+
 2007-02-26 Igor Zelmanovich <[email protected]>
 
 	* Login.cs: fixed:

+ 11 - 9
mcs/class/System.Web/System.Web.UI.WebControls/CreateUserWizard.cs

@@ -1531,8 +1531,8 @@ namespace System.Web.UI.WebControls
 				UserName, Password, Email, Question, Answer, !DisableCreatedUser, null, out status);
 
 			if ((newUser != null) && (status == MembershipCreateStatus.Success)) {
-				OnCreatedUser (new EventArgs ());
-				SendPasswordByMail(UserName, Password);
+				OnCreatedUser (new EventArgs ());
+				SendPasswordByMail (newUser, Password);
 				return true;
 			}
 
@@ -1574,18 +1574,20 @@ namespace System.Web.UI.WebControls
 			OnCreateUserError (new CreateUserErrorEventArgs (status));
 
 			return false;
-		}
-
-		private void SendPasswordByMail (string username, string password)
-		{
-			MembershipUser user = MembershipProviderInternal.GetUser (UserName, false);
+		}
+
+		private void SendPasswordByMail (MembershipUser user, string password)
+		{
 			if (user == null)
 				return;
+			
+			if (_mailDefinition == null)
+				return;
 			
 			string messageText = "A new account has been created for you. Please go to the site and log in using the following information.\nUser Name: <%USERNAME%>\nPassword: <%PASSWORD%>";
 
-			ListDictionary dictionary = new ListDictionary ();
-			dictionary.Add ("<%USERNAME%>", username);
+			ListDictionary dictionary = new ListDictionary ();
+			dictionary.Add ("<%USERNAME%>", user.UserName);
 			dictionary.Add ("<%PASSWORD%>", password);
 
 			MailMessage message = null;