summaryrefslogtreecommitdiff
path: root/modules/upload
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-09-21 07:56:09 +0000
committerDries Buytaert <dries@buytaert.net>2009-09-21 07:56:09 +0000
commitef33d44f66202a8d558fbefcb9346ed5752f92c4 (patch)
treeaef126a57132f100a82f03565ebf1146842b0e10 /modules/upload
parenta32c8ecfffb62cdb70f23a7a094c64a2b9503802 (diff)
downloadbrdo-ef33d44f66202a8d558fbefcb9346ed5752f92c4.tar.gz
brdo-ef33d44f66202a8d558fbefcb9346ed5752f92c4.tar.bz2
- Patch #556018 by Damien Tournoud, dereine | sun: rename drupal_to_js() and drupal_json() for consistency and readability.
Diffstat (limited to 'modules/upload')
-rw-r--r--modules/upload/upload.module2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 055e0cd91..e4451c3aa 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -644,7 +644,7 @@ function upload_js() {
if (!($cached_form = form_get_cache($_POST['form_build_id'], $cached_form_state)) || !isset($cached_form['#node']) || !isset($cached_form['attachments'])) {
form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.'));
$output = theme('status_messages');
- print drupal_to_js(array('status' => TRUE, 'data' => $output));
+ print drupal_json_encode(array('status' => TRUE, 'data' => $output));
exit();
}