Index: trunk/wb/framework/frontend.functions.php
===================================================================
--- trunk/wb/framework/frontend.functions.php (revision 477)
+++ trunk/wb/framework/frontend.functions.php (revision 478)
@@ -75,12 +75,18 @@
$search_string = implode("|", $arr_string);
$string = entities_to_umlauts($search_string, 'UTF-8');
$string = strtr($string, $string_ul_umlauts);
+ $foo = strtr($foo, array("<"=>"!,,!", ">"=>"!,,,!", "&"=>"!,,,,!", """=>"!,,,,,!", "'"=>"!,,,,,,!"));
+ $string = strtr($string, array("<"=>"!,,!", ">"=>"!,,,!", "&"=>"!,,,,!", """=>"!,,,,,!", "'"=>"!,,,,,,!"));
$foo = preg_replace('/('.$string.')(?=[^>]*<)/iUS', '$1',$foo);
$pos = strpos($foo, '<');
if ($pos === false) { // "===" means identicaly
$foo = preg_replace('/('.$string.')/i', '$1',$foo);
}
- $foo = umlauts_to_entities($foo, 'UTF-8', 0);
+ $foo = strtr($foo, array("!,,!"=>"<", "!,,,!"=>">", "!,,,,!"=>"&", "!,,,,,!"=>""", "!,,,,,,!"=>"'"));
+ if(DEFAULT_CHARSET != 'utf-8') {
+ $foo = mb_convert_encoding_wrapper($foo, DEFAULT_CHARSET, 'UTF-8');
+ //$foo = umlauts_to_entities($foo, 'UTF-8');
+ }
return $foo;
}
Index: trunk/wb/framework/functions.php
===================================================================
--- trunk/wb/framework/functions.php (revision 477)
+++ trunk/wb/framework/functions.php (revision 478)
@@ -488,7 +488,7 @@
'Á'=>'Á','á'=>'á',
'Â'=>'Â','â'=>'â','´'=>'´','Æ'=>'Æ','æ'=>'æ',
'À'=>'À','à'=>'à','ℵ'=>'ℵ','Α'=>'Α','α'=>'α',
- '&'=>'&','∧'=>'∧','∠'=>'∠','''=>''','Å'=>'Å','å'=>'å',
+ '∧'=>'∧','∠'=>'∠','''=>''','Å'=>'Å','å'=>'å',
'≈'=>'≈','Ã'=>'Ã','ã'=>'ã','Ä'=>'Ä','ä'=>'ä',
'„'=>'„','Β'=>'Β','β'=>'β','¦'=>'¦','•'=>'•',
'∩'=>'∩','Ç'=>'Ç','ç'=>'ç','¸'=>'¸','¢'=>'¢',
@@ -501,7 +501,7 @@
'Η'=>'Η','η'=>'η','Ð'=>'Ð','ð'=>'ð','Ë'=>'Ë','ë'=>'ë',
'€'=>'€','∃'=>'∃','ƒ'=>'ƒ','∀'=>'∀','½'=>'½',
'¼'=>'¼','¾'=>'¾','⁄'=>'⁄','Γ'=>'Γ','γ'=>'γ',
- '≥'=>'≥','>'=>'>','⇔'=>'⇔','↔'=>'↔','♥'=>'♥',
+ '≥'=>'≥','⇔'=>'⇔','↔'=>'↔','♥'=>'♥',
'…'=>'…','Í'=>'Í','í'=>'í','Î'=>'Î','î'=>'î',
'¡'=>'¡','Ì'=>'Ì','ì'=>'ì','ℑ'=>'ℑ','∞'=>'∞',
'∫'=>'∫','Ι'=>'Ι','ι'=>'ι','¿'=>'¿','∈'=>'∈',
@@ -508,7 +508,7 @@
'Ï'=>'Ï','ï'=>'ï','Κ'=>'Κ','κ'=>'κ','Λ'=>'Λ',
'λ'=>'λ','⟨'=>'〈','«'=>'«','⇐'=>'⇐','←'=>'←',
'⌈'=>'⌈','“'=>'“','≤'=>'≤','⌊'=>'⌊','∗'=>'∗',
- '◊'=>'◊',''=>'','‹'=>'‹','‘'=>'‘','<'=>'<',
+ '◊'=>'◊',''=>'','‹'=>'‹','‘'=>'‘',
'¯'=>'¯','—'=>'—','µ'=>'µ','·'=>'·','−'=>'−',
'Μ'=>'Μ','μ'=>'μ','∇'=>'∇',' '=>' ','–'=>'–',
'≠'=>'≠','∋'=>'∋','¬'=>'¬','∉'=>'∉','⊄'=>'⊄',
@@ -540,7 +540,7 @@
$numbered_to_named_entities=array(
'Á'=>'Á','á'=>'á','Â'=>'Â','â'=>'â','´'=>'´',
'Æ'=>'Æ','æ'=>'æ','À'=>'À','à'=>'à','ℵ'=>'ℵ',
- 'Α'=>'Α','α'=>'α','&'=>'&','∧'=>'∧','∠'=>'∠',
+ 'Α'=>'Α','α'=>'α','∧'=>'∧','∠'=>'∠',
'''=>''','Å'=>'Å','å'=>'å','≈'=>'≈','Ã'=>'Ã',
'ã'=>'ã','Ä'=>'Ä','ä'=>'ä','„'=>'„','Β'=>'Β',
'β'=>'β','¦'=>'¦','•'=>'•','∩'=>'∩','Ç'=>'Ç',
@@ -554,7 +554,7 @@
'Ð'=>'Ð','ð'=>'ð','Ë'=>'Ë','ë'=>'ë','€'=>'€',
'∃'=>'∃','ƒ'=>'ƒ','∀'=>'∀','½'=>'½','¼'=>'¼',
'¾'=>'¾','⁄'=>'⁄','Γ'=>'Γ','γ'=>'γ','≥'=>'≥',
- '>'=>'>','⇔'=>'⇔','↔'=>'↔','♥'=>'♥','…'=>'…',
+ '⇔'=>'⇔','↔'=>'↔','♥'=>'♥','…'=>'…',
'Í'=>'Í','í'=>'í','Î'=>'Î','î'=>'î','¡'=>'¡',
'Ì'=>'Ì','ì'=>'ì','ℑ'=>'ℑ','∞'=>'∞','∫'=>'∫',
'Ι'=>'Ι','ι'=>'ι','¿'=>'¿','∈'=>'∈','Ï'=>'Ï',
@@ -561,7 +561,7 @@
'ï'=>'ï','Κ'=>'Κ','κ'=>'κ','Λ'=>'Λ','λ'=>'λ',
'〈'=>'⟨','«'=>'«','⇐'=>'⇐','←'=>'←','⌈'=>'⌈',
'“'=>'“','≤'=>'≤','⌊'=>'⌊','∗'=>'∗','◊'=>'◊',
- ''=>'','‹'=>'‹','‘'=>'‘','<'=>'<','¯'=>'¯',
+ ''=>'','‹'=>'‹','‘'=>'‘','¯'=>'¯',
'—'=>'—','µ'=>'µ','·'=>'·','−'=>'−','Μ'=>'Μ',
'μ'=>'μ','∇'=>'∇',' '=>' ','–'=>'–','≠'=>'≠',
'∋'=>'∋','¬'=>'¬','∉'=>'∉','⊄'=>'⊄','Ñ'=>'Ñ',
@@ -695,6 +695,8 @@
// decode html-entities
if(preg_match("/&[#a-zA-Z0-9]+;/", $string)) {
$string=string_decode_encode_entities($string, 'UTF-8', 'HTML-ENTITIES');
+ //$string=mb_convert_encoding_wrapper($string, 'HTML-ENTITIES', 'UTF-8');
+ //$string=mb_convert_encoding_wrapper($string, 'UTF-8', 'HTML-ENTITIES');
}
}
else {
@@ -721,15 +723,15 @@
$string=utf8_encode($string);
}
// encode html-entities
- $string=string_decode_encode_entities($string, 'HTML-ENTITIES', 'UTF-8');
- //$string=mb_convert_encoding_wrapper($string, 'HTML-ENTITIES', 'UTF-8');
+ //$string=string_decode_encode_entities($string, 'HTML-ENTITIES', 'UTF-8');
+ $string=mb_convert_encoding_wrapper($string, 'HTML-ENTITIES', 'UTF-8');
}
else {
$string = string_to_utf8($string, $charset_in);
// encode html-entities
if (is_UTF8($string)) {
- $string=string_decode_encode_entities($string, 'HTML-ENTITIES', 'UTF-8');
- //$string=mb_convert_encoding_wrapper($string, 'HTML-ENTITIES', 'UTF-8');
+ //$string=string_decode_encode_entities($string, 'HTML-ENTITIES', 'UTF-8');
+ $string=mb_convert_encoding_wrapper($string, 'HTML-ENTITIES', 'UTF-8');
}
}
return $string;