aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-25 16:06:09 -0800
committerfriendica <info@friendica.com>2011-12-25 16:06:09 -0800
commit629a69f9dc96ceefeedb72927ed87ba26deac451 (patch)
tree0884ce9d1df1833affa63f8aaeb9f21e7d35b7f9 /mod
parent4a28832e2dfec09d0895a1909344ca2e8bb9938b (diff)
parent3e4fa23f3bab3534b96ab824991a9fdae2f26731 (diff)
downloadvolse-hubzilla-629a69f9dc96ceefeedb72927ed87ba26deac451.tar.gz
volse-hubzilla-629a69f9dc96ceefeedb72927ed87ba26deac451.tar.bz2
volse-hubzilla-629a69f9dc96ceefeedb72927ed87ba26deac451.zip
Merge branch 'pull'
Diffstat (limited to 'mod')
-rw-r--r--mod/settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php
index ad22ba1a6..35902f831 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -574,7 +574,7 @@ function settings_content(&$a) {
'$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
'$mail_server' => array('mail_server', t('IMAP server name:'), $mail_server, ''),
'$mail_port' => array('mail_port', t('IMAP port:'), $mail_port, ''),
- '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TSL'=>'TSL', 'SSL'=>'SSL')),
+ '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
'$mail_user' => array('mail_user', t('Email login name:'), $mail_user, ''),
'$mail_pass' => array('mail_pass', t('Email password:'), '', ''),
'$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'),