From: Tim Düsterhus <timwolla@googlemail.com>
Date: Sat, 8 Aug 2015 16:32:52 +0000 (+0200)
Subject: Add mail_smtp_starttls to enableoptions of mail_send_method
X-Git-Tag: 3.0.0_Beta_1~2134
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48c57a3b2a4b7b77df4bb13e8bc75a3300d98910;p=GitHub%2FWoltLab%2FWCF.git

Add mail_smtp_starttls to enableoptions of mail_send_method
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index f2acd558da..fa5ea7b49c 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -811,9 +811,9 @@ physical:wcf.acp.option.google_maps_type.physical]]></selectoptions>
 				<selectoptions><![CDATA[php:wcf.acp.option.mail_send_method.php
 smtp:wcf.acp.option.mail_send_method.smtp
 debug:wcf.acp.option.mail_send_method.debug]]></selectoptions>
-				<enableoptions><![CDATA[php:mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_smtp_password
-smtp:!mail_use_f_param,mail_smtp_host,mail_smtp_port,mail_smtp_user,mail_smtp_password
-debug:!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_smtp_password]]></enableoptions>
+				<enableoptions><![CDATA[php:mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_starttls,!mail_smtp_user,!mail_smtp_password
+smtp:!mail_use_f_param,mail_smtp_host,mail_smtp_port,mail_smtp_starttls,mail_smtp_user,mail_smtp_password
+debug:!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_starttls,!mail_smtp_user,!mail_smtp_password]]></enableoptions>
 			</option>
 			<option name="mail_smtp_host">
 				<categoryname>general.mail.send</categoryname>