CRM-16211 fix - 'Activity Subject' not filled in when creating PDF letters from template

[civicrm-core.git] / templates / CRM / Mailing / Form / InsertTokens.tpl

diff --git a/templates/CRM/Mailing/Form/InsertTokens.tpl b/templates/CRM/Mailing/Form/InsertTokens.tpl
index d3155eff0b05a8ef31455189eb8b555f06247b1b..57dc5c8122c901cc18b9940ba497512eaa72eafc 100644 (file)
--- a/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -167,9 +167,6 @@ function selectValue( val, prefix) {
       if (prefix == "SMS") {
           text_message = "sms_text_message";
       }
-      else {
-        cj("#subject").val( data.subject );
-      }
       if ( data.msg_text ) {
         cj("#"+text_message).val( data.msg_text );
         cj("div.text").show();
@@ -184,6 +181,9 @@ function selectValue( val, prefix) {
     if (prefix == "SMS") {
       return;
     }
+    else {
+      cj("#subject").val( data.subject );
+    }
     var html_body  = "";
     if (  data.msg_html ) {
       html_body = data.msg_html;