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

Fixing bad UTF-8.

4.6.x
Steven Wittens 2004-11-04 03:33:26 +00:00
parent 4fa64b57c2
commit d13943e245
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/search.module
View File

@ -409,7 +409,7 @@ function search_index($sid, $type, $text) {
function do_search($keys, $type, $join = '', $where = '1') { function do_search($keys, $type, $join = '', $where = '1') {
// Note, we replace the wildcards with U+FFFD (Replacement character) to pass // Note, we replace the wildcards with U+FFFD (Replacement character) to pass
// through the keyword extractor. // through the keyword extractor.
$keys = str_replace('*', '�', $keys); $keys = str_replace('*', '<EFBFBD>', $keys);
// Split into words // Split into words
$keys = search_keywords_split($keys); $keys = search_keywords_split($keys);
@ -425,9 +425,9 @@ function do_search($keys, $type, $join = '', $where = '1') {
if (string_length($word) < variable_get('remove_short', 3)) { if (string_length($word) < variable_get('remove_short', 3)) {
continue; continue;
} }
if (strpos($word, '�') !== false) { if (strpos($word, '<EFBFBD>') !== false) {
$words[] = "i.word LIKE '%s'"; $words[] = "i.word LIKE '%s'";
$arguments[] = str_replace('�', '%', $word); $arguments[] = str_replace('<EFBFBD>', '%', $word);
} }
else { else {
$words[] = "i.word = '%s'"; $words[] = "i.word = '%s'";

6
modules/search/search.module
View File

@ -409,7 +409,7 @@ function search_index($sid, $type, $text) {
function do_search($keys, $type, $join = '', $where = '1') { function do_search($keys, $type, $join = '', $where = '1') {
// Note, we replace the wildcards with U+FFFD (Replacement character) to pass // Note, we replace the wildcards with U+FFFD (Replacement character) to pass
// through the keyword extractor. // through the keyword extractor.
$keys = str_replace('*', '�', $keys); $keys = str_replace('*', '<EFBFBD>', $keys);
// Split into words // Split into words
$keys = search_keywords_split($keys); $keys = search_keywords_split($keys);
@ -425,9 +425,9 @@ function do_search($keys, $type, $join = '', $where = '1') {
if (string_length($word) < variable_get('remove_short', 3)) { if (string_length($word) < variable_get('remove_short', 3)) {
continue; continue;
} }
if (strpos($word, '�') !== false) { if (strpos($word, '<EFBFBD>') !== false) {
$words[] = "i.word LIKE '%s'"; $words[] = "i.word LIKE '%s'";
$arguments[] = str_replace('�', '%', $word); $arguments[] = str_replace('<EFBFBD>', '%', $word);
} }
else { else {
$words[] = "i.word = '%s'"; $words[] = "i.word = '%s'";