*** /Users/chrismitchell/Desktop/search404/search404.module	2009-07-10 04:28:08.000000000 -0400
--- /Users/chrismitchell/Desktop/search404_mine/search404.module	2009-08-26 16:14:51.000000000 -0400
***************
*** 38,43 ****
--- 38,45 ----
   * data. Return must be sanatized before use.
   */
  function search404_get_keys() {
+   global $language;
+ 
    // Abort query on certain extensions, e.g: gif jpg jpeg png
    $extensions = preg_split('/\s+/', variable_get('search404_ignore_query', 'gif jpg jpeg bmp png'));
    $extensions = trim(implode('|', $extensions));
***************
*** 45,50 ****
--- 47,55 ----
      return FALSE;
    }
    $keys = $_REQUEST['destination'] ? $_REQUEST['destination'] : $_REQUEST['q'];
+   if (LANGUAGE_NEGOTIATION_PATH_DEFAULT && $language->language) {
+ 	$keys = preg_replace("/^".$language->language."\//", '', $keys);
+   }
    $regex_filter = variable_get('search404_regex', '');
    $keys_array[] = $keys;
    if (!empty($regex_filter)) {