Use Twig escaping

kasimi · Oct 21, 2017 · cb05cb8 · cb05cb8
1 parent f2b0e0f
commit cb05cb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/adm/style/acp_mchat_globalusersettings_content.html b/adm/style/acp_mchat_globalusersettings_content.html
@@ -87,7 +87,7 @@
 <dl>
  <dt><label for="user_mchat_dateoptions">{{ lang('MCHAT_DATE_FORMAT') ~ lang('COLON') }}</label><br /><span>{{ lang('MCHAT_DATE_FORMAT_EXPLAIN') }}</span></dt>
  <dd>
- <select name="user_mchat_dateoptions" id="user_mchat_dateoptions" onchange="phpbb.toggleDisplay('user_mchat_custom_date', this.value == 'custom' ? 1 : -1); document.getElementById('user_mchat_date').value = this.value == 'custom' ? '{{ A_MCHAT_DEFAULT_DATEFORMAT }}' : this.value;"{% if MCHAT_DATE_NOAUTH %} disabled{% endif %}>
+ <select name="user_mchat_dateoptions" id="user_mchat_dateoptions" onchange="phpbb.toggleDisplay('user_mchat_custom_date', this.value == 'custom' ? 1 : -1); document.getElementById('user_mchat_date').value = this.value == 'custom' ? '{{ MCHAT_DEFAULT_DATEFORMAT | escape('js') }}' : this.value;"{% if MCHAT_DATE_NOAUTH %} disabled{% endif %}>
  {{ S_MCHAT_DATEFORMAT_OPTIONS }}
  </select>
  </dd>

diff --git a/core/settings.php b/core/settings.php
@@ -401,7 +401,7 @@ public function get_date_template_data($selected)
 
  return array(
  'S_MCHAT_DATEFORMAT_OPTIONS' => $dateformat_options,
- 'A_MCHAT_DEFAULT_DATEFORMAT' => addslashes($ucp_settings['mchat_date']['default']),
+ 'MCHAT_DEFAULT_DATEFORMAT' => $ucp_settings['mchat_date']['default'],
  'S_MCHAT_CUSTOM_DATEFORMAT' => $s_custom,
  );
  }

diff --git a/styles/prosilver/template/ucp_mchat.html b/styles/prosilver/template/ucp_mchat.html
@@ -128,7 +128,7 @@ <h2>{{ lang('MCHAT_PREFERENCES') }}</h2>
  <dl>
  <dt><label for="user_mchat_dateoptions">{{ lang('MCHAT_DATE_FORMAT') ~ lang('COLON') }}</label><br /><span>{{ lang('MCHAT_DATE_FORMAT_EXPLAIN') }}</span></dt>
  <dd>
- <select name="user_mchat_dateoptions" id="user_mchat_dateoptions" onchange="phpbb.toggleDisplay('user_mchat_custom_date', this.value == 'custom' ? 1 : -1); document.getElementById('user_mchat_date').value = this.value == 'custom' ? '{{ A_MCHAT_DEFAULT_DATEFORMAT }}' : this.value;">
+ <select name="user_mchat_dateoptions" id="user_mchat_dateoptions" onchange="phpbb.toggleDisplay('user_mchat_custom_date', this.value == 'custom' ? 1 : -1); document.getElementById('user_mchat_date').value = this.value == 'custom' ? '{{ MCHAT_DEFAULT_DATEFORMAT | escape('js') }}' : this.value;">
  {{ S_MCHAT_DATEFORMAT_OPTIONS }}
  </select>
  </dd>