diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-09 08:18:47 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-09 08:18:47 +0000 |
| commit | 51d658497099bb388405ac642c29a3b5136ad05e (patch) | |
| tree | 92f9e531b6b525e8fc8db7b72d8c8c758f01b582 /roundcubemail/program/steps | |
| parent | 967de2f3fe4ba59d87ab5d73b716865970983f36 (diff) | |
- Use built-in json_encode() for proper JSON format in AJAX replies (and compat. with jQuery 1.4)
git-svn-id: https://svn.roundcube.net/trunk@3170 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index a441e00b6..999242c1a 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/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/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index b3016ee2a..6b2ce0907 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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 = ''; } |