From 3e0f8d7f1ebb9cd655fd9826cac11f163c91d230 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 May 2014 17:38:08 +0200
Subject: [PATCH] [ticket/10073] Move template code into the template

PHPBB3-10073
---
 phpBB/adm/style/acp_contact.html   | 6 +++---
 phpBB/includes/acp/acp_contact.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index 9578b3df83..532617cc16 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -53,13 +53,13 @@
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 				<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF not S_BBCODE_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
 				<!-- ENDIF -->
 				<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF not S_SMILIES_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
 				<!-- ENDIF -->
 				<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF not S_MAGIC_URL_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
 				<!-- ENDIF -->
 			</dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
diff --git a/phpBB/includes/acp/acp_contact.php b/phpBB/includes/acp/acp_contact.php
index 21807082fc..9abc901e54 100644
--- a/phpBB/includes/acp/acp_contact.php
+++ b/phpBB/includes/acp/acp_contact.php
@@ -95,9 +95,9 @@ class acp_contact
 			'CONTACT_US_INFO'			=> $contact_admin_edit['text'],
 			'CONTACT_US_INFO_PREVIEW'	=> $contact_admin_info_preview,
 
-			'S_BBCODE_CHECKED'		=> (!$contact_admin_edit['allow_bbcode']) ? ' checked="checked"' : '',
-			'S_SMILIES_CHECKED'		=> (!$contact_admin_edit['allow_smilies']) ? ' checked="checked"' : '',
-			'S_MAGIC_URL_CHECKED'	=> (!$contact_admin_edit['allow_urls']) ? ' checked="checked"' : '',
+			'S_BBCODE_ALLOWED'		=> $contact_admin_edit['allow_bbcode'],
+			'S_SMILIES_ALLOWED'		=> $contact_admin_edit['allow_smilies'],
+			'S_MAGIC_URL_ALLOWED'	=> $contact_admin_edit['allow_urls'],
 
 			'BBCODE_STATUS'			=> $user->lang('BBCODE_IS_ON', '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>'),
 			'SMILIES_STATUS'		=> $user->lang['SMILIES_ARE_ON'],