diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-09-21 07:56:09 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-09-21 07:56:09 +0000 |
| commit | ef33d44f66202a8d558fbefcb9346ed5752f92c4 (patch) | |
| tree | aef126a57132f100a82f03565ebf1146842b0e10 /modules/system | |
| parent | a32c8ecfffb62cdb70f23a7a094c64a2b9503802 (diff) | |
| download | brdo-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/system')
| -rw-r--r-- | modules/system/system.admin.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 2d8c81713..74dbd47a8 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1790,7 +1790,7 @@ function system_regional_settings_submit($form, &$form_state) { */ function system_date_time_lookup() { $result = format_date(REQUEST_TIME, 'custom', $_GET['format']); - drupal_json($result); + drupal_json_output($result); } /** diff --git a/modules/system/system.module b/modules/system/system.module index ab3c966b5..7ed7a6818 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -816,7 +816,7 @@ function system_menu() { ); $items['admin/config/search/clean-urls/check'] = array( 'title' => 'Clean URL check', - 'page callback' => 'drupal_json', + 'page callback' => 'drupal_json_output', 'page arguments' => array(array('status' => TRUE)), 'access callback' => TRUE, 'type' => MENU_CALLBACK, @@ -2656,7 +2656,7 @@ function system_timezone($abbreviation = '', $offset = -1, $is_daylight_saving_t // interpreted as the empty string. $abbreviation = $abbreviation ? $abbreviation : ''; $timezone = timezone_name_from_abbr($abbreviation, intval($offset), $is_daylight_saving_time); - drupal_json($timezone); + drupal_json_output($timezone); } /** @@ -2768,7 +2768,7 @@ function system_page_build(&$page) { // Trigger cron run via AJAX. '#attached' => array( 'js' => array( - '(function($){ $.get(' . drupal_to_js(url('system/run-cron-image')) . '); })(jQuery);' => array('type' => 'inline', 'scope' => 'header'), + '(function($){ $.get(' . drupal_json_encode(url('system/run-cron-image')) . '); })(jQuery);' => array('type' => 'inline', 'scope' => 'header'), ), ), // Trigger cron run for clients not supporting JavaScript (fall-back). |