Issue #306 - Upgrading HTMLPurifier's Encoder class, so it not to depend on iconv too much. The encoding conversion functions from the multibyte string library might help for dealing with some encodings even without iconv or mbstring.

skala
Ivan Tcholakov 17 years ago
parent 1f4c57f8bf
commit e7b2a09acb
  1. 20
      main/inc/lib/htmlpurifier/library/HTMLPurifier/Encoder.php

@ -288,6 +288,16 @@ class HTMLPurifier_Encoder
restore_error_handler();
return $str;
}
// Added Ivan Tcholakov, 09-SEP-2009.
// Next try - encoding conversion related functions form Dokeos LMS,
// for some encodings they work even without iconv or mbstring installed.
elseif (function_exists('api_is_encoding_supported')) {
if (api_is_encoding_supported($encoding)) {
$str = api_utf8_encode($str, $encoding);
restore_error_handler();
return $str;
}
}
trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
}
@ -323,6 +333,16 @@ class HTMLPurifier_Encoder
restore_error_handler();
return $str;
}
// Added Ivan Tcholakov, 09-SEP-2009.
// Next try - encoding conversion related functions form Dokeos LMS,
// for some encodings they work even without iconv or mbstring installed.
elseif (function_exists('api_is_encoding_supported')) {
if (api_is_encoding_supported($encoding)) {
$str = api_utf8_decode($str, $encoding);
restore_error_handler();
return $str;
}
}
trigger_error('Encoding not supported', E_USER_ERROR);
}

Loading…
Cancel
Save