diff options
Diffstat (limited to 'includes/functions')
| -rw-r--r-- | includes/functions/functions_edit.php | 3 | ||||
| -rw-r--r-- | includes/functions/functions_mail.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index 141ddd8f90..baf8ca7d8a 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -136,7 +136,6 @@ function edit_field_log_frequency($name, $selected='', $extra='') { // Print an edit control for a contact method field function edit_field_contact($name, $selected='', $extra='') { - global $WT_STORE_MESSAGES; // Different ways to contact the users $CONTACT_METHODS=array( 'messaging' =>i18n::translate('webtrees internal messaging'), @@ -145,7 +144,7 @@ function edit_field_contact($name, $selected='', $extra='') { 'mailto' =>i18n::translate('Mailto link'), 'none' =>i18n::translate('No contact'), ); - if (!$WT_STORE_MESSAGES) { + if (!get_site_setting('STORE_MESSAGES')) { unset($CONTACT_METHODS['messaging'], $CONTACT_METHODS['messaging2']); } return select_edit_control($name, $CONTACT_METHODS, null, $selected, $extra); diff --git a/includes/functions/functions_mail.php b/includes/functions/functions_mail.php index 6b7e3b23f2..3fa5202a5d 100644 --- a/includes/functions/functions_mail.php +++ b/includes/functions/functions_mail.php @@ -50,7 +50,7 @@ function webtreesMail($to, $from, $subject, $message) { $SMTP_AUTH_USER=get_site_setting('SMTP_AUTH_USER'); $SMTP_AUTH_PASS=get_site_setting('SMTP_AUTH_PASS'); $SMTP_SSL =get_site_setting('SMTP_SSL'); - global $WT_STORE_MESSAGES, $TEXT_DIRECTION; + global $TEXT_DIRECTION; $mailFormat = "plain"; //$mailFormat = "html"; //$mailFormat = "multipart"; |