fix script to show cc/bcc fields

3 files changed, 8 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index beb28238d..5249f7518 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/05/12 (estadtherr)
+----------
+- fix JavaScript in compose.html that shows cc/bcc fields if populated
+
 2008/05/12 (alec)
 - Updated PEAR::DB package to version 1.7.13
 
diff --git a/program/js/app.js b/program/js/app.js
index aa90b3f41..fec57400f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1835,8 +1835,8 @@ function rcube_webmail()
     {
     // check input fields
     var input_to = rcube_find_object('_to');
-    var input_cc = rcube_find_object('_to');
-    var input_bcc = rcube_find_object('_to');
+    var input_cc = rcube_find_object('_cc');
+    var input_bcc = rcube_find_object('_bcc');
     var input_subject = rcube_find_object('_subject');
     var input_message = rcube_find_object('_message');
     
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index f45c63bcb..25a3ef91f 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -164,10 +164,10 @@ function rcmail_prev_sibling(elm)
 <script type="text/javascript">
 <!--
 
-var cc_field = document.form._cc;
+var cc_field = document.getElementById('rcmcomposecc');
 if (cc_field && cc_field.value!='')
   rcmail_show_header_form('compose-cc', document.getElementById('addcclink'));
-var bcc_field = document.form._bcc;
+var bcc_field = document.getElementById('rcmcomposebcc');
 if (bcc_field && bcc_field.value!='')
   rcmail_show_header_form('compose-bcc', document.getElementById('addbcclink'));