diff options
| -rw-r--r-- | includes/mail.inc | 14 | ||||
| -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 |
4 files changed, 16 insertions, 13 deletions
diff --git a/includes/mail.inc b/includes/mail.inc index 912d64359..f1797b7bb 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -14,8 +14,9 @@ * appropriate places in the template. Processed e-mail templates are * requested from hook_mail() from the module sending the e-mail. Any module * can modify the composed e-mail message array using hook_mail_alter(). - * Finally drupal_mail_send() sends the e-mail, which can be reused - * if the exact same composed e-mail is to be sent to multiple recipients. + * Finally drupal_mail_sending_system()->mail() sends the e-mail, which can + * be reused if the exact same composed e-mail is to be sent to multiple + * recipients. * * Finding out what language to send the e-mail with needs some consideration. * If you send e-mail to a user, her preferred language should be fine, so @@ -77,7 +78,8 @@ * @param $from * Sets From to this value, if given. * @param $send - * Send the message directly, without calling drupal_mail_send() manually. + * Send the message directly, without calling + * drupal_mail_sending_system()->mail() manually. * @return * The $message array structure containing all details of the * message. If already sent ($send = TRUE), then the 'result' element @@ -165,7 +167,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N * * @code * array( - * 'default-system' => 'DrupalMailSend', + * 'default-system' => 'DefaultMailSystem', * 'user' => 'DevelMailLog', * ); * @endcode @@ -175,7 +177,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N * * @code * array( - * 'default-system' => 'DrupalMailSend', + * 'default-system' => 'DefaultMailSystem', * 'user' => 'DevelMailLog', * 'contact_page_autoreply' => 'DrupalDevNullMailSend', * ); @@ -197,7 +199,7 @@ function drupal_mail_sending_system($module, $key) { $instances = &drupal_static(__FUNCTION__, array()); $id = $module . '_' . $key; - $configuration = variable_get('mail_sending_system', array('default-system' => 'DrupalMailSend')); + $configuration = variable_get('mail_sending_system', array('default-system' => 'DefaultMailSystem')); // Look for overrides for the default class, starting from the most specific // id, and falling back to the module name. 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. |