- use proper unicode cleanup for JSON, fixes #1486356

alecpl

2009-12-11 2717f9f68e74277379c065d32bd0771976e49c86

 program/steps/mail/compose.inc

@@ -55,8 +55,8 @@
  
  // pipe compose parameters thru plugins
  $plugin = $RCMAIL->plugins->exec_hook('message_compose', $_SESSION['compose']);
  $_SESSION['compose']['param'] = $plugin['param'];
  
  $_SESSION['compose']['param'] = array_merge($_SESSION['compose']['param'], $plugin['param']);   

  // add attachments listed by message_compose hook
  if (is_array($plugin['attachments'])) {
    foreach ($plugin['attachments'] as $attach) {
@@ -445,10 +445,10 @@
    else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
      $body = rcmail_create_draft_body($body, $isHtml);
  }
  else if (!empty($_SESSION['compose']['param']['body']))
  {
    $body = $_SESSION['compose']['param']['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" : '';