handle mailsystem register/cleanup better
This commit is contained in:
@@ -695,11 +695,9 @@ function booking_uninstall() {
|
|||||||
*/
|
*/
|
||||||
function booking_enable() {
|
function booking_enable() {
|
||||||
drupal_set_message($message = t('The Booking System module was successfully enabled.'), $type = 'status');
|
drupal_set_message($message = t('The Booking System module was successfully enabled.'), $type = 'status');
|
||||||
variable_set('mail_system', array('default-system' => 'DefaultMailSystem', 'booking' => 'BookingMailSystem'));
|
$current = variable_get('mail_system', array('default-system' => 'DefaultMailSystem'));
|
||||||
//let MIME Mail know that we can send html emails
|
$addition = array('booking' => 'BookingMailSystem');
|
||||||
mailsystem_set(array(
|
variable_set('mail_system', array_merge($current, $addition));
|
||||||
'booking' => 'BookingMailSystem',
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -707,11 +705,9 @@ function booking_enable() {
|
|||||||
*/
|
*/
|
||||||
function booking_disable() {
|
function booking_disable() {
|
||||||
drupal_set_message($message = t('The Booking System module was successfully disabled.'), $type = 'status');
|
drupal_set_message($message = t('The Booking System module was successfully disabled.'), $type = 'status');
|
||||||
variable_set('mail_system', array('default-system' => 'DefaultMailSystem'));
|
$mail_system = variable_get('mail_system', array('default-system' => 'DefaultMailSystem'));
|
||||||
//clean up our entry about mailsystems
|
unset($mail_system['booking']);
|
||||||
mailsystem_clear(array(
|
variable_set('mail_system', $mail_system);
|
||||||
'booking' => 'BookingMailSystem',
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user