Cleanup patch by yched
authorEarl Miles
Thu, 7 Sep 2006 16:46:46 +0000 (16:46 +0000)
committerEarl Miles
Thu, 7 Sep 2006 16:46:46 +0000 (16:46 +0000)
views.module
views_query.inc

index 6899831..58b7a4a 100644 (file)
@@ -1806,10 +1806,6 @@ function views_handler_filter_like($op, $filter, $filterinfo, &$query) {
     case 'handler':
       $table = $filterinfo['table'];
       $column = $filterinfo['field'];
-      if (empty($column)) {
-        $fieldbits = explode('.', $filter['field']);
-        $column = $fieldbits[1];
-      }
       $field = "$table.$column";
       $query->ensure_table($table);
 
@@ -1854,10 +1850,6 @@ function views_handler_filter_timestamp($op, $filter, $filterinfo, &$query) {
 
   $table = $filterinfo['table'];
   $column = $filterinfo['field'];
-  if (empty($column)) {
-    $fieldbits = explode('.', $filter['field']);
-    $column = $fieldbits[1];
-  }
   $field = "$table.$column";
   if ($filterinfo['from_unixtime']) {
     $field = "from_UNIXTIME($field)";
index a6024e1..9ab9c21 100644 (file)
@@ -85,6 +85,7 @@ function _views_view_build_filters(&$query, &$view) {
       $fieldbits = explode('.', $filter['field']);
       $field = $fieldbits[1];
     }
+    $filterinfo['field'] = $field;
 
     $view->used_filters = array();