From f91a4990461d44f12755628f732b3b25544b96cc Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 20 Dec 2006 14:26:37 +0000
Subject: Little fix for new string quoting

---
 program/include/main.inc      | 3 +--
 program/steps/mail/upload.inc | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'program')

diff --git a/program/include/main.inc b/program/include/main.inc
index 1abd84aa8..c6370eae9 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1020,7 +1020,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
   // if the replace tables for XML and JS are not yet defined
   if (!$js_rep_table)
     {
-    $js_rep_tabl = $xml_rep_table = array();
+    $js_rep_table = $xml_rep_table = array();
     $xml_rep_table['&'] = '&amp;';
 
     for ($c=160; $c<256; $c++)  // can be increased to support more charsets
@@ -1032,7 +1032,6 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
         $js_rep_table[Chr($c)] = sprintf("\u%s%s", str_repeat('0', 4-strlen($hex)), $hex);
       }
 
-    $js_rep_table['"'] = sprintf("\u%s%s", str_repeat('0', 4-strlen(dechex(34))), dechex(34));
     $xml_rep_table['"'] = '&quot;';
     }
 
diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index 50a6dba36..0d9761e44 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -56,9 +56,9 @@ foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
     $content = sprintf('<a href="#delete" onclick="return %s.command(\\\'remove-attachment\\\', \\\'rcmfile%d\\\', this)" title="%s">%s</a>%s',
                        $JS_OBJECT_NAME,
                        $id,
-                       JQ(Q(rcube_label('delete'))),
-                       JQ($button),
-                       JQ(Q($_FILES['_attachments']['name'][$i])));
+                       Q(rcube_label('delete')),
+                       $button,
+                       Q($_FILES['_attachments']['name'][$i]));
 
     $response .= sprintf('parent.%s.add2attachment_list(\'rcmfile%d\',\'%s\');',
                          $JS_OBJECT_NAME,
-- 
cgit v1.2.3