Index: trunk/kernel/frontaction.php =================================================================== diff -u -N -r1020 -r1031 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 1020) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 1031) @@ -817,14 +817,14 @@ else { $key_arr = explode(' ', $keywords); - foreach($key_arr as $value) { + /*foreach($key_arr as $value) { if (strlen($value) < $length) { $keywords = str_replace(' '.$value, '', $keywords); $keywords = str_replace($value.' ', '', $keywords); } - } + }*/ - $keywords = str_replace(' ', ' ', $keywords); + //$keywords = str_replace(' ', ' ', $keywords); //$keywords = str_replace('\"', '', $keywords); $performSearch = (strlen($keywords) >= $length); @@ -937,14 +937,14 @@ else { $key_arr = explode(' ', $keywords); - foreach($key_arr as $value) { + /*foreach($key_arr as $value) { if (strlen($value) < $length) { $keywords = str_replace(' '.$value, '', $keywords); $keywords = str_replace($value.' ', '', $keywords); } - } + }*/ - $keywords = str_replace(' ', ' ', $keywords); + //$keywords = str_replace(' ', ' ', $keywords); $performSearch = (strlen($keywords) >= $length); } Index: trunk/kernel/include/searchitems.php =================================================================== diff -u -N -r1026 -r1031 --- trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 1026) +++ trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 1031) @@ -580,7 +580,8 @@ { global $KeywordIgnore; - if(count($KeywordIgnore)==0) + //echo "Passed Phrase: $phrase
"; + if(count($KeywordIgnore)==0) GetIgnoreList(); $keywords["normal"]= array(); $keywords["required"]= array(); @@ -604,7 +605,7 @@ break; $exact_word=substr($phrase, $i+1, ($exact_match_close-$i)-1); $exact_word = str_replace("\\", "", $exact_word); - $exact_word = trim($exact_word); + $exact_word = trim($exact_word); $i=$exact_match_close; if($exact_word) { @@ -687,19 +688,22 @@ switch(substr($keyword,0,1)) { case "|": - $keywords["normal"][]= trim(substr($keyword,1)); + $keywords["normal"][]= substr($keyword,1); break; case "+": - $keywords["required"][] = trim(substr($keyword,1)); + $keywords["required"][] = substr($keyword,1); break; case "-": - $keywords["notallowed"][] = trim(substr($keyword,1)); + $keywords["notallowed"][] = substr($keyword,1); break; case "=": - $keywords["ignored"][] = trim(substr($keyword,1)); + $keywords["ignored"][] = substr($keyword,1); break; } } + + //print_pre($keywords); + return($keywords); }