Search uses the old search text after error in search text

Patch seems ok, but I'd like to find where does this bug comes from at the first place… Are you using the default search block, or a custom block?

Just chiming in to say I can't reproduce this error with a custom search block - Custom Search 1.16, core 7.27.

When I type two characters in the search field, hit enter and I get the "You must include at least one positive keyword with 3 characters or more" message. Add a couple of characters so the search term is at least 3, hit enter, and I just get no results, no warning message as expected.

@yingtho: no, neither

This patch works well for me to clear the error message of the keyword limits. Thanks, yingtho.
The search form on the result page is the default search not the custom search, if you enter more than 3 characters, it will get no warning message. But if you write a new custom search form on the result page by yourself, it will need you to clear the error message first and then to work.

The $language in the patch is not enough, it only gets the current language. We should consider if "current language and language neutral" is selected in "Search content from".

I changed as below:

// Add language if custom search i18n is included.
if (module_exists('custom_search_i18n'))
{
$i18n_search_language = variable_get('custom_search_i18n_search_language', 'all');
if ($i18n_search_language == 'current') {
$keys = search_expression_insert($keys, 'language', i18n_language()->language);
}
elseif ($i18n_search_language == 'current_neutral') {
$keys = search_expression_insert($keys, 'language', i18n_language()->language . ',und');
}
$q[count($q) - 1] .= $keys;
}

Error in the posted image is not coming after applying the patch. Patch is working fine, moving to RTBC.