Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Moving comment

4.6.x
Steven Wittens 2005-03-03 20:08:02 +00:00
parent e68280064e
commit 36aaecd27e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/common.inc
View File

@ -1640,7 +1640,6 @@ function drupal_xml_parser_create(&$data) {
} }
// Unsupported encodings are converted here into UTF-8. // Unsupported encodings are converted here into UTF-8.
// Requires the iconv, GNU recode or mbstring PHP extension.
$php_supported = array('utf-8', 'iso-8859-1', 'us-ascii'); $php_supported = array('utf-8', 'iso-8859-1', 'us-ascii');
if (!in_array(strtolower($encoding), $php_supported)) { if (!in_array(strtolower($encoding), $php_supported)) {
$out = drupal_convert_to_utf8($data, $encoding); $out = drupal_convert_to_utf8($data, $encoding);
@ -1662,6 +1661,8 @@ function drupal_xml_parser_create(&$data) {
/** /**
* Convert data to UTF-8 * Convert data to UTF-8
* *
* Requires the iconv, GNU recode or mbstring PHP extension.
*
* @param $data * @param $data
* The data to be converted. * The data to be converted.
* @param $encoding * @param $encoding