| Index: trunk/wiki2xml/php/xml2docbook_xml.php |
| — | — | @@ -44,12 +44,12 @@ |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | function fix_text ( $s ) { |
| 48 | | - $s = html_entity_decode ( $s ) ; |
| 49 | | - filter_named_entities ( $s ) ; |
| 50 | | - $s = str_replace ( "&" , "&" , $s ) ; |
| 51 | | - $s = str_replace ( "<" , "<" , $s ) ; |
| 52 | | - $s = str_replace ( ">" , ">" , $s ) ; |
| 53 | | - return utf8_decode ( $s ) ; |
| | 48 | + $s = html_entity_decode ( $s , ENT_COMPAT, 'UTF-8') ; // dbu 2007-08-20 |
| | 49 | + filter_named_entities ( $s ) ; |
| | 50 | + $s = str_replace ( "&" , "&" , $s ) ; |
| | 51 | + $s = str_replace ( "<" , "<" , $s ) ; |
| | 52 | + $s = str_replace ( ">" , ">" , $s ) ; |
| | 53 | + return $s; // utf8_decode ( $s ) ; // dbu 2007-08-20 |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | function add_temp_text ( &$temp ) { |