aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-28 14:54:00 -0700
committerfriendica <info@friendica.com>2012-03-28 14:54:00 -0700
commit4fe0b56d765d98b79592cf855d72e823d4478854 (patch)
treea870620b5e7dc9b364dcf4f1f8fb67258a42172c
parente894775a39920edc0e438364c818357ab809bace (diff)
downloadvolse-hubzilla-4fe0b56d765d98b79592cf855d72e823d4478854.tar.gz
volse-hubzilla-4fe0b56d765d98b79592cf855d72e823d4478854.tar.bz2
volse-hubzilla-4fe0b56d765d98b79592cf855d72e823d4478854.zip
bug #349 - email notls setting
-rwxr-xr-xboot.php2
-rwxr-xr-xmod/settings.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index e0ab98bde..9582372ca 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1294' );
+define ( 'FRIENDICA_VERSION', '2.3.1295' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1133 );
diff --git a/mod/settings.php b/mod/settings.php
index 99bf8842d..db7330fb5 100755
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -618,7 +618,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'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
+ '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( 'notls'=>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'),