diff options
| author | Christian Helbling | 2015-11-16 15:20:03 +0100 |
|---|---|---|
| committer | Christian Helbling | 2015-11-16 15:20:03 +0100 |
| commit | 2587921cdf5f9139c6f2483dddb12df27740fef5 (patch) | |
| tree | b67941b93eda2490800efafd1f5410bdd754bf16 /it_html.class | |
| parent | babb09e211e93c6236bc19e60a4f649e573a6f4e (diff) | |
| parent | 3b4aeabd9186666e025d3233f06f7458356bfc37 (diff) | |
| download | itools-2587921cdf5f9139c6f2483dddb12df27740fef5.tar.gz itools-2587921cdf5f9139c6f2483dddb12df27740fef5.tar.bz2 itools-2587921cdf5f9139c6f2483dddb12df27740fef5.zip | |
Merge branch 'master' into cs/php7
Diffstat (limited to 'it_html.class')
| -rw-r--r-- | it_html.class | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/it_html.class b/it_html.class index e8969fb..e9e312b 100644 --- a/it_html.class +++ b/it_html.class @@ -509,7 +509,7 @@ function Q($string) { if (preg_match('/[<>&"\x00-\x08\x0a-\x0c\x0e-\x1f\x80-\xff]/', $string)) # WARNING: copy/pasted to _tag() { - $charset = $GLOBALS['it_html']->p['charset']; + $charset = $GLOBALS['it_html']->p['charset'] ?: ini_get('default_charset'); if ($GLOBALS['debug_utf8check'] && $charset == "utf-8") $string = it::any2utf8($string, "error in Q()"); |