Avoid double-encoding of HTML entities in signature edit field

Thomas Bruederli

2012-11-19 810efee4d36da6edbc721c82c3a97966005101de

Avoid double-encoding of HTML entities in signature edit field

 program/steps/settings/edit_identity.inc

@@ -87,9 +87,10 @@
  if ($IDENTITY_RECORD['html_signature']) {
    $form['signature']['content']['signature']['class']      = 'mce_editor';
    $form['signature']['content']['signature']['is_escaped'] = true;
  }

  $IDENTITY_RECORD['signature'] = htmlentities($IDENTITY_RECORD['signature'], ENT_NOQUOTES, RCMAIL_CHARSET);
    // Correctly handle HTML entities in HTML editor (#1488483)
    $IDENTITY_RECORD['signature'] = htmlspecialchars($IDENTITY_RECORD['signature'], ENT_NOQUOTES, RCMAIL_CHARSET);
  }

  // disable some field according to access level
  if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3) {