Index: country_code.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/country_code/country_code.views.inc,v
retrieving revision 1.13
diff -u -r1.13 country_code.views.inc
--- country_code.views.inc	28 Oct 2008 20:46:34 -0000	1.13
+++ country_code.views.inc	26 Nov 2008 04:03:43 -0000
@@ -18,9 +18,6 @@
       'country_code_handler_filter_node_country' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
-      'country_code_handler_filter_node_country_current' => array(
-        'parent' => 'views_handler_filter',
-      ),
     ),
   );
 }
@@ -29,11 +26,8 @@
  * Substitute country code and country language; this works with cached queries.
  */
 function country_code_views_query_substitutions($view) {
-  global $language;
   return array(
     '***COUNTRY_CODE***' => country_code(),
-    // Pass a two-digit language, to be used as a fallback.
-    '***COUNTRY_CODE_LANGUAGE***' => substr($language->language, 0, 2),
   );
 }
 
@@ -61,16 +55,6 @@
         'label' => t('Country'),
       ),
     );
-    // Current country field.
-    $data['node']['country_code_current'] = array(
-      'title' => t("Current country's language"),
-      'help' => t("Content for the current country language, with a generic language fallback. If the current language is fr-CA for Canadian French, this filter will show content in the fr-CA language or, if there isn't such a translation, a fr version."),
-      'filter' => array(
-        'field' => 'language',
-        'handler' => 'country_code_handler_filter_node_country_current',
-        'label' => t("Current country's language"),
-      ),
-    );
   }
 
 }
Index: country_code_handler_filter_node_country_current.inc
===================================================================
RCS file: country_code_handler_filter_node_country_current.inc
diff -N country_code_handler_filter_node_country_current.inc
--- country_code_handler_filter_node_country_current.inc	28 Oct 2008 20:46:34 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-<?php
-// $Id: country_code_handler_filter_node_country_current.inc,v 1.5 2008/10/28 20:46:34 nedjo Exp $
-
-/**
- * @file
- * Implementation of a views current country filter for the country code module.
- */
-
-/**
- * Filter by country.
- */
-class country_code_handler_filter_node_country_current extends views_handler_filter {
-
-  function query() {
-    $this->ensure_my_table();
-
-    $definition = array(
-      'table' => 'node',
-      'field' => 'tnid',
-      'left_table' => 'node',
-      'left_field' => 'tnid',
-      'extra' => array(
-        array(
-          'field' => 'language',
-          'value' => '***CURRENT_LANGUAGE***',
-        ),
-      ),
-    );
-
-    $join = new views_join();
-    $join->definition = $definition;
-    $join->construct();
-
-    $alias = $this->query->add_table('node', NULL, $join);
-    $this->query->add_where($this->options['group'], "$this->table_alias.language =
-'%s' OR ($this->table_alias.language =
-'%s' AND $alias.nid IS NULL)", array('***CURRENT_LANGUAGE***', '***COUNTRY_CODE_LANGUAGE***'));
-  }
-
-}