[Hastymail-cvs] SF.net SVN: hastymail:[2034] trunk/hastymail2/lib/url_action_class.php

[<sai...@us...>]

Revision: 2034
          http://hastymail.svn.sourceforge.net/hastymail/?rev=2034&view=rev
Author:   sailfrog
Date:     2012-01-16 23:42:50 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
fix a bug that caused using %u as the default_email_address to incorrectly strip out the domain part of the login username

Modified Paths:
--------------
    trunk/hastymail2/lib/url_action_class.php

Modified: trunk/hastymail2/lib/url_action_class.php
===================================================================
--- trunk/hastymail2/lib/url_action_class.php	2012-01-16 23:31:13 UTC (rev 2033)
+++ trunk/hastymail2/lib/url_action_class.php	2012-01-16 23:42:50 UTC (rev 2034)
@@ -247,6 +247,9 @@
     if (isset($conf['user_defaults']['email_address']) && $conf['user_defaults']['email_address']) {
         $email = $conf['user_defaults']['email_address'];
         if (strpos($username, '@') !== false) {
+            if ($email == '%u') {
+                $email = $username;
+            }
             $username = substr($username, 0, strpos($username, '@'));
         }
         $email = trim(str_replace('%u', $username, $email));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.