Adjust UTF-8 Support to match SMF code (Fixes #89)
jdarwood007 commited on 2019-02-10 12:15:36
Showing 2 changed files, with 1 additions and 6 deletions.
- sd_source/Subs-SimpleDeskPost.php 0ef9a83..67b90f5
- sd_source/Subs-SimpleDeskSearch.php 4fc76c2..8e2a52a
| ... | ... |
@@ -837,10 +837,6 @@ function shd_load_custom_fields($is_ticket = true, $ticketContext = 0, $dept = 0 |
| 837 | 837 |
if ($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['type'] == CFIELD_TYPE_MULTI) |
| 838 | 838 |
$field_values[$row['id_field']] = explode(',', $field_values[$row['id_field']]);
|
| 839 | 839 |
|
| 840 |
- // Large text boxes may need fixing. |
|
| 841 |
- if ($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['type'] == CFIELD_TYPE_LARGETEXT) |
|
| 842 |
- $field_values[$row['id_field']] = html_to_bbc($field_values[$row['id_field']]); |
|
| 843 |
- |
|
| 844 | 840 |
$context['ticket_form']['custom_fields'][$loc][$row['id_field']]['value'] = $field_values[$row['id_field']]; |
| 845 | 841 |
} |
| 846 | 842 |
} |
| ... | ... |
@@ -37,8 +37,7 @@ function shd_search_charset() |
| 37 | 37 |
{
|
| 38 | 38 |
global $context, $modSettings, $txt; |
| 39 | 39 |
|
| 40 |
- $utf8 = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8' && (strpos(strtolower(PHP_OS), 'win') === false || @version_compare(PHP_VERSION, '4.2.3') != -1); |
|
| 41 |
- $charset = !empty($txt['lang_character_set']) ? $txt['lang_character_set'] : ($utf8 ? 'UTF-8' : 'ISO-8859-1'); |
|
| 40 |
+ $charset = !empty($txt['lang_character_set']) ? $txt['lang_character_set'] : 'UTF-8'; |
|
| 42 | 41 |
|
| 43 | 42 |
if (empty($modSettings['shd_search_charset'])) |
| 44 | 43 |
$modSettings['shd_search_charset'] = '0..9, A..Z, a..z, &, ~'; |
| 45 | 44 |