diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-20 20:54:57 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:46 +0200 |
| commit | 975afa90480f6d48f266e40870fb948a38e00f2a (patch) | |
| tree | bd3f3fa4a7084dc25c0ac229e2ca37dbd644909d | |
| parent | 81f22a1c8e4e67d83a9308ad832db3c96a835798 (diff) | |
| download | forums-975afa90480f6d48f266e40870fb948a38e00f2a.tar forums-975afa90480f6d48f266e40870fb948a38e00f2a.tar.gz forums-975afa90480f6d48f266e40870fb948a38e00f2a.tar.bz2 forums-975afa90480f6d48f266e40870fb948a38e00f2a.tar.xz forums-975afa90480f6d48f266e40870fb948a38e00f2a.zip | |
[ticket/10073] Deduplicate template variable names
PHPBB3-10073
| -rw-r--r-- | phpBB/adm/style/acp_contact.html | 6 | ||||
| -rw-r--r-- | 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 532617cc16..828fd4b659 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"<!-- IF not S_BBCODE_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label> + <label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label> <!-- ENDIF --> <!-- IF S_SMILIES_ALLOWED --> - <label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF not S_SMILIES_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label> + <label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label> <!-- ENDIF --> <!-- IF S_LINKS_ALLOWED --> - <label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF not S_MAGIC_URL_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label> + <label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> 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 c681018efd..b53bfd022f 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_ALLOWED' => $contact_admin_edit['allow_bbcode'], - 'S_SMILIES_ALLOWED' => $contact_admin_edit['allow_smilies'], - 'S_MAGIC_URL_ALLOWED' => $contact_admin_edit['allow_urls'], + 'S_BBCODE_DISABLE_CHECKED' => !$contact_admin_edit['allow_bbcode'], + 'S_SMILIES_DISABLE_CHECKED' => !$contact_admin_edit['allow_smilies'], + 'S_MAGIC_URL_DISABLE_CHECKED' => !$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'], |