liquid_feedback_frontend
changeset 952:ba824959fc1f
Fixed handling of notify_email while registering
author | bsw |
---|---|
date | Mon Dec 10 19:59:07 2012 +0100 (2012-12-10) |
parents | 99852ec8ee37 |
children | 3b74187efaa3 |
files | app/main/index/_action/register.lua |
line diff
1.1 --- a/app/main/index/_action/register.lua Sat Dec 01 23:50:18 2012 +0100 1.2 +++ b/app/main/index/_action/register.lua Mon Dec 10 19:59:07 2012 +0100 1.3 @@ -18,8 +18,6 @@ 1.4 return false 1.5 end 1.6 1.7 -local old_notify_email = member.notify_email 1.8 - 1.9 local notify_email = param.get("notify_email") 1.10 1.11 if not config.locked_profile_fields.notify_email and notify_email then 1.12 @@ -33,10 +31,9 @@ 1.13 } 1.14 return false 1.15 end 1.16 - member.notify_email = notify_email 1.17 end 1.18 1.19 -if member and not member.notify_email then 1.20 +if member and not notify_email then 1.21 request.redirect{ 1.22 mode = "redirect", 1.23 module = "index", 1.24 @@ -59,7 +56,7 @@ 1.25 view = "register", 1.26 params = { 1.27 code = member.invite_code, 1.28 - notify_email = member.notify_email, 1.29 + notify_email = notify_email, 1.30 step = 1 1.31 } 1.32 } 1.33 @@ -75,7 +72,7 @@ 1.34 view = "register", 1.35 params = { 1.36 code = member.invite_code, 1.37 - notify_email = member.notify_email, 1.38 + notify_email = notify_email, 1.39 step = 1 1.40 } 1.41 } 1.42 @@ -86,14 +83,14 @@ 1.43 1.44 end 1.45 1.46 -if member.notify_email and not member.name then 1.47 +if notify_email and not member.name then 1.48 request.redirect{ 1.49 mode = "redirect", 1.50 module = "index", 1.51 view = "register", 1.52 params = { 1.53 code = member.invite_code, 1.54 - notify_email = member.notify_email, 1.55 + notify_email = notify_email, 1.56 step = 1 1.57 } 1.58 } 1.59 @@ -112,7 +109,7 @@ 1.60 view = "register", 1.61 params = { 1.62 code = member.invite_code, 1.63 - notify_email = member.notify_email, 1.64 + notify_email = notify_email, 1.65 name = member.name, 1.66 step = 1 1.67 } 1.68 @@ -129,7 +126,7 @@ 1.69 view = "register", 1.70 params = { 1.71 code = member.invite_code, 1.72 - notify_email = member.notify_email, 1.73 + notify_email = notify_email, 1.74 name = member.name, 1.75 step = 1 1.76 } 1.77 @@ -146,7 +143,7 @@ 1.78 view = "register", 1.79 params = { 1.80 code = member.invite_code, 1.81 - notify_email = member.notify_email, 1.82 + notify_email = notify_email, 1.83 name = member.name, 1.84 step = 1 1.85 } 1.86 @@ -176,7 +173,7 @@ 1.87 view = "register", 1.88 params = { 1.89 code = member.invite_code, 1.90 - notify_email = member.notify_email, 1.91 + notify_email = notify_email, 1.92 name = member.name, 1.93 login = member.login 1.94 } 1.95 @@ -203,7 +200,7 @@ 1.96 member.name = name 1.97 end 1.98 1.99 - if notify_email ~= old_notify_email then 1.100 + if notify_email ~= member.notify_email then 1.101 local success = member:set_notify_email(notify_email) 1.102 if not success then 1.103 slot.put_into("error", _"Can't send confirmation email") 1.104 @@ -233,4 +230,4 @@ 1.105 view = "login", 1.106 } 1.107 end 1.108 - 1.109 \ No newline at end of file 1.110 +