diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/simpletest/simpletest.test | 6 | ||||
| -rw-r--r-- | modules/system/system.api.php | 6 | ||||
| -rw-r--r-- | modules/user/user.module | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index 8975957c0..9d14abee7 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -302,7 +302,7 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase { $this->assertEqual(count($captured_emails), 0, t('The captured e-mails queue is empty.'), t('E-mail')); // Send the e-mail. - $response = drupal_mail_send($message); + $response = drupal_mail_sending_system('simpletest', 'drupal_mail_test')->mail($message); // Ensure that there is one e-mail in the captured e-mails array. $captured_emails = $this->drupalGetMails(); @@ -323,7 +323,7 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase { 'to' => $this->randomName(32) . '@example.com', 'body' => $this->randomString(512), ); - drupal_mail_send($message); + drupal_mail_sending_system('drupal_mail_test', $index)->mail($message); } // There should now be 6 e-mails captured. @@ -340,7 +340,7 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase { // Send the last e-mail again, so we can confirm that the drupalGetMails-filter // correctly returns all e-mails with a given property/value. - drupal_mail_send($message); + drupal_mail_sending_system('drupal_mail_test', $index)->mail($message); $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test_4')); $this->assertEqual(count($captured_emails), 2, t('All e-mails with the same id are returned when filtering by id.'), t('E-mail')); } diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 922a340f3..a4ca25049 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -661,9 +661,9 @@ function hook_image_toolkits() { * * Email messages sent using functions other than drupal_mail() will not * invoke hook_mail_alter(). For example, a contributed module directly - * calling the drupal_mail_send() or PHP mail() function will not invoke this - * hook. All core modules use drupal_mail() for messaging, it is best practice - * but not manditory in contributed modules. + * calling the drupal_mail_sending_system()->mail() or PHP mail() function + * will not invoke this hook. All core modules use drupal_mail() for + * messaging, it is best practice but not manditory in contributed modules. * * @param $message * An array containing the message data. Keys in this array include: diff --git a/modules/user/user.module b/modules/user/user.module index bfabe61d0..c0cead24a 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2757,7 +2757,8 @@ function user_preferred_language($account, $default = NULL) { * @param $language * Optional language to use for the notification, overriding account language. * @return - * The return value from drupal_mail_send(), if ends up being called. + * The return value from drupal_mail_sending_system()->mail(), if ends up + * being called. */ function _user_mail_notify($op, $account, $language = NULL) { // By default, we always notify except for canceled and blocked. |