/[drupal]/contributions/modules/smtp/smtp.module
ViewVC logotype

Diff of /contributions/modules/smtp/smtp.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.17.2.11, Tue Nov 10 12:13:49 2009 UTC revision 1.17.2.12, Tue Nov 10 17:03:10 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: smtp.module,v 1.17.2.10 2009/11/10 11:06:14 franz Exp $  // $Id: smtp.module,v 1.17.2.11 2009/11/10 12:13:49 franz Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 55  function smtp_menu() { Line 55  function smtp_menu() {
55   */   */
56  function smtp_admin_settings() {  function smtp_admin_settings() {
57    // Override the smtp_library variable.    // Override the smtp_library variable.
58    if (module_exists('mimemail')) {    if (module_exists('mimemail') &&
59          strpos(variable_get('smtp_library', ''), 'mimemail')) {
60      // don't touch smtp_library      // don't touch smtp_library
61    }    }
62    else {    else {
# Line 814  function _smtp_get_substring($source, $t Line 815  function _smtp_get_substring($source, $t
815    return $substring;    return $substring;
816  }  //  End of _smtp_get_substring().  }  //  End of _smtp_get_substring().
817    
818  function drupal_mail_wrapper($message) {  if (!strpos(variable_get('smtp_library', ''), 'mimemail') &&
819    return smtp_drupal_mail_wrapper($message);        !function_exists('drupal_mail_wrapper') ) {
820    
821      function drupal_mail_wrapper($message) {
822        return smtp_drupal_mail_wrapper($message);
823      }
824  }  }
825    
   
826  if (module_exists('mimemail')) {  if (module_exists('mimemail')) {
827  /**  /**
828   * hook_mailengine for SMTP/MIMEMAIL integration   * hook_mailengine for SMTP/MIMEMAIL integration
Legend:
Removed from v.1.17.2.11  
changed lines
  Added in v.1.17.2.12
  ViewVC Help
Powered by ViewVC 1.1.2