- move compose_message_body hook to better place (#1486353)

git-svn-id: https://svn.roundcube.net/trunk@3172 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 5 deletions

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index 999242c1a..842f28c60 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -444,13 +444,12 @@ function rcmail_compose_body($attrib)
     // load draft message body
     else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
       $body = rcmail_create_draft_body($body, $isHtml);
-
-    $plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
-      array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
-
-    $body = $plugin['body'];  
   }
 
+  $plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
+    array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
+  $body = $plugin['body'];  
+
   $out = $form_start ? "$form_start\n" : '';
 
   $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));