Author: gwimmel
Date: Thu Mar 27 09:36:16 2014
New Revision: 1582232
URL: http://svn.apache.org/r1582232
Log:
[SYNCOPE-487] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/resources/mailTemplates/optin.html.vm
syncope/trunk/core/src/main/resources/mailTemplates/optin.txt.vm
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1581960-1582228
Modified: syncope/trunk/core/src/main/resources/mailTemplates/optin.html.vm
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/mailTemplates/optin.html.vm?rev=1582232&r1=1582231&r2=1582232&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/mailTemplates/optin.html.vm (original)
+++ syncope/trunk/core/src/main/resources/mailTemplates/optin.html.vm Thu Mar
27 09:36:16 2014
@@ -24,7 +24,7 @@ under the License.
<p>
Your username is $user.getUsername().<br/>
Your email address is $user.getAttrMap().get("email").getValues().get(0).
- Your email address inside a <a
href="http://localhost/?email=$esc.url($user.getUsername())">link</a>.
+ Your email address inside a <a
href="http://localhost/?email=$esc.url($user.getAttrMap().get("email").getValues().get(0))">link</a>.
</p>
<p>
Modified: syncope/trunk/core/src/main/resources/mailTemplates/optin.txt.vm
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/mailTemplates/optin.txt.vm?rev=1582232&r1=1582231&r2=1582232&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/mailTemplates/optin.txt.vm (original)
+++ syncope/trunk/core/src/main/resources/mailTemplates/optin.txt.vm Thu Mar 27
09:36:16 2014
@@ -13,7 +13,7 @@ Hi $user.getAttrMap().get("firstname").g
Your username is $user.getUsername().
Your email address is $user.getAttrMap().get("email").getValues().get(0).
-Your email address inside a link:
http://localhost/?email=$esc.url($user.getUsername()) .
+Your email address inside a link:
http://localhost/?email=$esc.url($user.getAttrMap().get("email").getValues().get(0))
.
This message was sent to the following recipients:
#foreach($recipient in $recipients)
