--- i18n.module.orig	2008-04-01 18:10:32.000000000 +0200
+++ i18n.module	2008-06-19 14:27:47.000000000 +0200
@@ -363,11 +363,14 @@
  * 
  * Rewrite node queries so language selection options are enforced
  */
-function i18n_db_rewrite_sql($query, $primary_table, $primary_key){
+function i18n_db_rewrite_sql($query, $primary_table, $primary_key, $args = array()){
   // If mode is 'off' = no rewrite, we cannot return any empty 'where' string so check here
   $mode = i18n_selection_mode();
   if ($mode == 'off') return;
   
+  // Disable language conditions for views
+  if (array_key_exists('view',$args)) return;
+
   switch ($primary_table) {
     case 'n':
     case 'node':
@@ -662,26 +665,6 @@
 }
 
 /**
- * Implementation of hook_views_pre_query().
- * 
- * Disable language conditions for views. This is called before filter handlers
- * 
- * @ TODO Check whether these views hooks still exist in Drupal 6
- */
-function i18n_pre_query(&$view) {
-  i18n_selection_mode(variable_get('i18n_selection_mode', 'off'));
-}
-
-/**
- * Implementation of hook_views_pre_view().
- * 
- * If used language selection filter, reset query rewriting again
- */
-function i18n_pre_view(&$view, &$items) {
-  i18n_selection_mode('reset');
-}
-
-/**
  * @defgroup i18n_api Extended language API
  * @{
  * This is an extended language API to be used by modules in i18n package.