? .kdev4
? 484600-views-disable_live_preview_1_0.patch.1
? 790956-add-local-action-1_0.patch
? sites
? views-496840_0_0_0_0.patch
? views-531686-7.3-install
? views-7-update.patch.1
? views-DRUPAL-7--3.kdev4
? views-export-api_version.patch
? views-file-file_managed.patch
? views-glossary.patch
Index: handlers/views_handler_argument_string.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_string.inc,v
retrieving revision 1.5.4.1
diff -u -p -r1.5.4.1 views_handler_argument_string.inc
--- handlers/views_handler_argument_string.inc	2 Nov 2009 22:01:25 -0000	1.5.4.1
+++ handlers/views_handler_argument_string.inc	15 May 2010 09:31:35 -0000
@@ -137,7 +137,7 @@ class views_handler_argument_string exte
    * $this->ensure_my_table() MUST have been called prior to this.
    */
   function get_formula() {
-    return "SUBSTR($this->table_alias.$this->real_field, 1, " . intval($this->options['limit']) . ")";
+    return "SUBSTRING($this->table_alias.$this->real_field, 1, " . intval($this->options['limit']) . ")";
   }
 
   /**
@@ -164,10 +164,20 @@ class views_handler_argument_string exte
       $field = "$this->table_alias.$this->real_field";
     }
     else {
+      $formula = TRUE;
       $field = $this->get_formula();
     }
 
-    $this->query->add_where(0, $field, $argument);
+    if ($formula) {
+      $field .= '= :views_handler_argument_string';
+      $argument = array(
+        ':views_handler_argument_string' => $argument,
+      );
+      $this->query->add_where(0, $field, $argument, 'formula');
+    }
+    else {
+      $this->query->add_where(0, $field, $argument);
+    }
   }
 
   function summary_argument($data) {
Index: plugins/views_plugin_query_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_query_default.inc,v
retrieving revision 1.1.4.19
diff -u -p -r1.1.4.19 views_plugin_query_default.inc
--- plugins/views_plugin_query_default.inc	14 May 2010 17:07:10 -0000	1.1.4.19
+++ plugins/views_plugin_query_default.inc	15 May 2010 09:31:40 -0000
@@ -876,7 +876,12 @@ class views_plugin_query_default extends
     foreach ($this->$where as $group => $info) {
       $sub_group = $info['type'] == 'OR' ? db_or() : db_and();
       foreach ($info['conditions'] as $key => $clause) {
-        $sub_group->condition($clause['field'], $clause['value'], $clause['operator']);
+        if ($clause['operator'] == 'formula') {
+          $sub_group->where($clause['field'], $clause['value']);
+        }
+        else {
+          $sub_group->condition($clause['field'], $clause['value'], $clause['operator']);
+        }
       }
       $main_group->condition($sub_group);
     }