summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2008-11-26 13:52:13 (GMT)
committerDries Buytaert2008-11-26 13:52:13 (GMT)
commitb4534e89a5e9a18d02299507de1c97e5f6251347 (patch)
treecba2e9eb3114fbd9c0d4a7755ad0152f5afb8a86
parent63e195eb3024e9aa79c1c4bc7285b329329c91af (diff)
- Patch #263445 by Dave Reid, merlinofchaos: replace improper use of drupal_to_js() with drupal_json().
-rw-r--r--modules/profile/profile.admin.inc3
-rw-r--r--modules/system/system.admin.inc3
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/profile/profile.admin.inc b/modules/profile/profile.admin.inc
index 01f3bda..16f5860 100644
--- a/modules/profile/profile.admin.inc
+++ b/modules/profile/profile.admin.inc
@@ -401,6 +401,5 @@ function profile_admin_settings_autocomplete($string) {
while ($data = db_fetch_object($result)) {
$matches[$data->category] = check_plain($data->category);
}
- print drupal_to_js($matches);
- exit();
+ drupal_json($matches);
}
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 99033a3..e7c3780 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1717,8 +1717,7 @@ function system_date_time_settings_submit($form, &$form_state) {
*/
function system_date_time_lookup() {
$result = format_date(REQUEST_TIME, 'custom', $_GET['format']);
- echo drupal_to_js($result);
- exit;
+ drupal_json($result);
}
/**