summaryrefslogtreecommitdiff
path: root/modules/simpletest
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/simpletest
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/simpletest')
-rw-r--r--modules/simpletest/tests/database_test.module10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/simpletest/tests/database_test.module b/modules/simpletest/tests/database_test.module
index df446deb8..422f097fc 100644
--- a/modules/simpletest/tests/database_test.module
+++ b/modules/simpletest/tests/database_test.module
@@ -77,7 +77,7 @@ function database_test_menu() {
*/
function database_test_db_query_temporary() {
$table_name = db_query_temporary('SELECT status FROM {system}', array());
- drupal_json(array(
+ drupal_json_output(array(
'table_name' => $table_name,
'row_count' => db_select($table_name)->countQuery()->execute()->fetchField(),
));
@@ -102,7 +102,7 @@ function database_test_even_pager_query($limit) {
$names = $query->execute()->fetchCol();
- drupal_json(array(
+ drupal_json_output(array(
'names' => $names,
));
exit;
@@ -126,7 +126,7 @@ function database_test_odd_pager_query($limit) {
$names = $query->execute()->fetchCol();
- drupal_json(array(
+ drupal_json_output(array(
'names' => $names,
));
exit;
@@ -155,7 +155,7 @@ function database_test_tablesort() {
// We need all the results at once to check the sort.
$tasks = $query->execute()->fetchAll();
- drupal_json(array(
+ drupal_json_output(array(
'tasks' => $tasks,
));
exit;
@@ -184,7 +184,7 @@ function database_test_tablesort_first() {
// We need all the results at once to check the sort.
$tasks = $query->execute()->fetchAll();
- drupal_json(array(
+ drupal_json_output(array(
'tasks' => $tasks,
));
exit;