chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r20629] FS#306 - The multibyte string library: A correction of the previous commit SVN#20624.

Browse Source
skala
Ivan Tcholakov 17 years ago
parent bcdf93ab5c
commit ee7f7df624
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/inc/lib/multibyte_string_functions.lib.php

4
main/inc/lib/multibyte_string_functions.lib.php
Unescape View File

@ -99,7 +99,7 @@ function api_to_system_encoding($string, $from_encoding = null, $check_utf8_vali
// See http://php.net/manual/en/function.htmlentities // See http://php.net/manual/en/function.htmlentities
function api_htmlentities($string, $quote_style = ENT_COMPAT, $encoding = null) { function api_htmlentities($string, $quote_style = ENT_COMPAT, $encoding = null) {
if (empty($encoding)) { if (empty($encoding)) {
$from_encoding = api_mb_internal_encoding(); $encoding = api_mb_internal_encoding();
} }
if (!api_is_utf8($encoding) && api_html_entity_supports($encoding)) { if (!api_is_utf8($encoding) && api_html_entity_supports($encoding)) {
return htmlentities($string, $quote_style, $encoding); return htmlentities($string, $quote_style, $encoding);
@ -123,7 +123,7 @@ function api_htmlentities($string, $quote_style = ENT_COMPAT, $encoding = null)
// See http://php.net/html_entity_decode // See http://php.net/html_entity_decode
function api_html_entity_decode($string, $quote_style = ENT_COMPAT, $encoding = null) { function api_html_entity_decode($string, $quote_style = ENT_COMPAT, $encoding = null) {
if (empty($encoding)) { if (empty($encoding)) {
$from_encoding = api_mb_internal_encoding(); $encoding = api_mb_internal_encoding();
} }
if (!api_is_utf8($encoding) && api_html_entity_supports($encoding)) { if (!api_is_utf8($encoding) && api_html_entity_supports($encoding)) {
return html_entity_decode($string, $quote_style, $encoding); return html_entity_decode($string, $quote_style, $encoding);

Write Preview
Loading…
Cancel
Save