diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-15 16:18:46 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-15 16:18:46 +0000 |
commit | e1642603eac05665d959c3d63ea8d1efbe9e431a (patch) | |
tree | b927cc0b278e90594310d8291091d76af9c57d40 /modules/simpletest | |
parent | c7557262b3ac01f40613dd6141ef09d1ae7b84ba (diff) | |
download | brdo-e1642603eac05665d959c3d63ea8d1efbe9e431a.tar.gz brdo-e1642603eac05665d959c3d63ea8d1efbe9e431a.tar.bz2 |
#216098 by kwinters, jgoldberg, drawk, sun: Make drupal_goto() use the same parameters as url().
Diffstat (limited to 'modules/simpletest')
-rw-r--r-- | modules/simpletest/tests/common_test.module | 6 | ||||
-rw-r--r-- | modules/simpletest/tests/session_test.module | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module index 74866f098..8b6779463 100644 --- a/modules/simpletest/tests/common_test.module +++ b/modules/simpletest/tests/common_test.module @@ -63,9 +63,9 @@ function common_test_drupal_goto_land_fail() { /** * Implement hook_drupal_goto_alter(). */ -function common_test_drupal_goto_alter(&$args) { - if ($args['path'] == 'common-test/drupal_goto/fail') { - $args['path'] = 'common-test/drupal_goto/redirect'; +function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code) { + if ($path == 'common-test/drupal_goto/fail') { + $path = 'common-test/drupal_goto/redirect'; } } diff --git a/modules/simpletest/tests/session_test.module b/modules/simpletest/tests/session_test.module index d6c9914b2..01a9d3225 100644 --- a/modules/simpletest/tests/session_test.module +++ b/modules/simpletest/tests/session_test.module @@ -156,7 +156,7 @@ function session_test_form_user_login_alter(&$form) { * Force the redirection to go to a non-secure page after being on a secure * page through https.php. */ -function session_test_drupal_goto_alter(&$args) { +function session_test_drupal_goto_alter(&$path, &$options, &$http_response_code) { global $base_insecure_url; - $args['path'] = $base_insecure_url . '/' . $args['path']; + $path = $base_insecure_url . '/' . $path; } |