bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

non security modules update

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-20 16:32:07 +02:00
parent 6a8d30db08
commit 37fbabab56
466 changed files with 32690 additions and 9652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sites/all/modules/contrib/mail/maillog/maillog.module
View File

@@ -138,15 +138,15 @@ function maillog_admin_settings() {
'#title' => t("Display the e-mails on page using devel module (if enabled)."),
'#default_value' => variable_get('maillog_devel', TRUE),
);
if (module_exists('mimemail')) {
$engines = mimemail_get_engines();
if (module_exists('mailsystem')) {
$mailsystem_classes = mailsystem_get_classes();
// maillog will be unset, because ist would cause an recursion
unset($engines['maillog']);
unset($mailsystem_classes['MaillogMailSystem']);
$form['maillog_engine'] = array(
'#type' => 'select',
'#title' => t("Select the mailengine which should be used."),
'#default_value' => variable_get('maillog_engine', 'mimemail'),
'#options' => $engines,
'#title' => t("Select the mail system which should be used."),
'#default_value' => variable_get('maillog_engine', 'DefaultMailSystem'),
'#options' => $mailsystem_classes,
);
}
return system_settings_form($form);