From 82bf4796f9eafab5d6353f16b2b29b5f60dc34e4 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 11 Aug 2016 19:39:32 +0200
Subject: [PATCH] Resolve conflict

---
 settings/templates/admin/server.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index 1bf068de392..43df787d519 100644
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -38,14 +38,14 @@ $mail_smtpsecure = [
 ];
 
 $mail_smtpmode = [
-	'php',
-	'smtp',
+	['php', 'PHP'],
+	['smtp', 'SMTP'],
 ];
 if ($_['sendmail_is_available']) {
-	$mail_smtpmode[] = 'sendmail';
+	$mail_smtpmode[] = ['sendmail', 'Sendmail'];
 }
 if ($_['mail_smtpmode'] == 'qmail') {
-	$mail_smtpmode[] = 'qmail';
+	$mail_smtpmode[] = ['qmail', 'qmail'];
 }
 ?>
 
@@ -244,10 +244,10 @@ if ($_['mail_smtpmode'] == 'qmail') {
 			<select name='mail_smtpmode' id='mail_smtpmode'>
 				<?php foreach ($mail_smtpmode as $smtpmode):
 					$selected = '';
-					if ($smtpmode == $_['mail_smtpmode']):
+					if ($smtpmode[0] == $_['mail_smtpmode']):
 						$selected = 'selected="selected"';
 					endif; ?>
-					<option value='<?php p($smtpmode)?>' <?php p($selected) ?>><?php p($smtpmode) ?></option>
+					<option value='<?php p($smtpmode[0])?>' <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
 				<?php endforeach;?>
 			</select>
 
-- 
2.39.5