From 28bfe4dc80a1431655666cfb3cec30f89e3459c7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 23 Mar 2007 18:54:39 +0000
Subject: Fixed bugs #1484276 and #1484300

---
 program/steps/mail/func.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'program/steps')

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 1b98f1d52..37c1e1e19 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1398,10 +1398,10 @@ function rcmail_address_string($input, $max=NULL, $addicon=NULL)
     else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto']))
       {
       $out .= sprintf('<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>',
-                      $part['mailto'],
+                      Q($part['mailto']),
                       $JS_OBJECT_NAME,
-                      $part['mailto'],
-                      $part['mailto'],
+                      JQ($part['mailto']),
+                      Q($part['mailto']),
                       Q($part['name']));
                       
       if ($addicon)
@@ -1417,7 +1417,7 @@ function rcmail_address_string($input, $max=NULL, $addicon=NULL)
       if ($part['name'])
         $out .= Q($part['name']);
       if ($part['mailto'])
-        $out .= (strlen($out) ? ' ' : '') . sprintf('&lt;%s&gt;', $part['mailto']);
+        $out .= (strlen($out) ? ' ' : '') . sprintf('&lt;%s&gt;', Q($part['mailto']));
       }
       
     if ($c>$j)
-- 
cgit v1.2.3