diff options
author | alecpl <alec@alec.pl> | 2009-12-09 08:18:47 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2009-12-09 08:18:47 +0000 |
commit | e5d60d69d4108a0e62270548117773244ca1905e (patch) | |
tree | c70df9ed50f8c97252b8233fdfdeec1646f56640 /program/steps | |
parent | 46b48d9afc9ef9a7669fd0089005b79486b85dda (diff) |
- Use built-in json_encode() for proper JSON format in AJAX replies (and compat. with jQuery 1.4)
Diffstat (limited to 'program/steps')
-rw-r--r-- | program/steps/mail/compose.inc | 2 | ||||
-rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index a441e00b6..999242c1a 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -506,7 +506,7 @@ function rcmail_compose_body($attrib) JQ(Q(rcube_label('close'))), JQ(Q(rcube_label('revertto'))), JQ(Q(rcube_label('nospellerrors'))), - json_serialize($spellcheck_langs), + json_encode($spellcheck_langs), $lang, $attrib['id'], JS_OBJECT_NAME), 'foot'); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b3016ee2a..6b2ce0907 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -522,7 +522,7 @@ function rcmail_quota_display($attrib) if (is_array($quota)) { $OUTPUT->add_script('$(document).ready(function(){ - rcmail.set_quota('.json_serialize($quota).')});', 'foot'); + rcmail.set_quota('.json_encode($quota).')});', 'foot'); $quota = ''; } |