Issue #2855030 by dsnopek, catch: [views] Add D6 patch for SA-CONTRIB-2017-022

common/contrib/views/SA-CONTRIB-2017-022.patch

@@ -7,7 +7,7 @@ index 966ff98..b2533ef 100644
      $placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
  
 -    $result = db_query("SELECT name FROM {term_data} WHERE tid IN ($placeholders)", $this->value);
-+    $result = db_query(db_rewrite_sql("SELECT name FROM {term_data} td WHERE tid IN ($placeholders)", 'td', 'tid'), $this->value);
++    $result = db_query(db_rewrite_sql("SELECT name FROM {term_data} td WHERE td.tid IN ($placeholders)", 'td', 'tid', array($this->value)), $this->value);
      while ($term = db_fetch_object($result)) {
        $titles[] = check_plain($term->name);
      }
@@ -20,7 +20,7 @@ index ceb8ea5..36b3e97 100644
      $args[] = $this->options['vid'];
  
 -    $result = db_query("SELECT * FROM {term_data} td WHERE td.name IN (" . implode(', ', $placeholders) . ") AND td.vid = %d", $args);
-+    $result = db_query(db_rewrite_sql("SELECT * FROM {term_data} td WHERE td.name IN (" . implode(', ', $placeholders) . ") AND td.vid = %d", 'td', 'tid'), $args);
++    $result = db_query(db_rewrite_sql("SELECT * FROM {term_data} td WHERE td.name IN (" . implode(', ', $placeholders) . ") AND td.vid = %d", 'td', 'tid', $args), $args);
      while ($term = db_fetch_object($result)) {
        unset($missing[strtolower($term->name)]);
        $tids[] = $term->tid;
@@ -33,7 +33,7 @@ index 6903aa8..2bfe1d5 100644
          }
  
 -        $result = db_fetch_object(db_query("SELECT * FROM {term_data} WHERE tid = %d", $argument));
-+        $result = db_fetch_object(db_query(db_rewrite_sql("SELECT * FROM {term_data} td WHERE tid = %d", 'td', 'tid'),  $argument));
++        $result = db_fetch_object(db_query(db_rewrite_sql("SELECT * FROM {term_data} td WHERE td.tid = %d", 'td', 'tid', array($argument)),  $argument));
          if (!$result) {
            return FALSE;
          }
@@ -42,7 +42,7 @@ index 6903aa8..2bfe1d5 100644
            $placeholders = implode(', ', array_fill(0, count($test), '%d'));
  
 -          $result = db_query("SELECT * FROM {term_data} WHERE tid IN ($placeholders)", $test);
-+          $result = db_query(db_rewrite_sql("SELECT * FROM {term_data} td WHERE tid IN ($placeholders)", 'td', 'tid'), $test);
++          $result = db_query(db_rewrite_sql("SELECT * FROM {term_data} td WHERE td.tid IN ($placeholders)", 'td', 'tid', array($test)), $test);
            while ($term = db_fetch_object($result)) {
              if ($vids && empty($vids[$term->vid])) {
                $validated_cache[$term->tid] = FALSE;
@@ -51,11 +51,11 @@ index 6903aa8..2bfe1d5 100644
          }
          if ($transform) {
 -          $result = db_fetch_object(db_query("SELECT td.* FROM {term_data} td LEFT JOIN {term_synonym} ts ON ts.tid = td.tid WHERE (replace(td.name, ' ', '-') = '%s' OR replace(ts.name, ' ', '-') = '%s')$and", $argument, $argument));
-+          $result = db_fetch_object(db_query(db_rewrite_sql("SELECT td.* FROM {term_data} td LEFT JOIN {term_synonym} ts ON ts.tid = td.tid WHERE (replace(td.name, ' ', '-') = '%s' OR replace(ts.name, ' ', '-') = '%s')$and", 'td', 'tid'), $argument, $argument));
++          $result = db_fetch_object(db_query(db_rewrite_sql("SELECT td.* FROM {term_data} td LEFT JOIN {term_synonym} ts ON ts.tid = td.tid WHERE (replace(td.name, ' ', '-') = '%s' OR replace(ts.name, ' ', '-') = '%s')$and", 'td', 'tid', array($argument, $argument)), $argument, $argument));
          }
          else {
 -          $result = db_fetch_object(db_query("SELECT td.* FROM {term_data} td LEFT JOIN {term_synonym} ts ON ts.tid = td.tid WHERE (td.name = '%s' OR ts.name = '%s')$and", $argument, $argument));
-+          $result = db_fetch_object(db_query(db_rewrite_sql("SELECT td.* FROM {term_data} td LEFT JOIN {term_synonym} ts ON ts.tid = td.tid WHERE (td.name = '%s' OR ts.name = '%s')$and", 'td', 'tid'), $argument, $argument));
++          $result = db_fetch_object(db_query(db_rewrite_sql("SELECT td.* FROM {term_data} td LEFT JOIN {term_synonym} ts ON ts.tid = td.tid WHERE (td.name = '%s' OR ts.name = '%s')$and", 'td', 'tid', array($argument, $argument)), $argument, $argument));
          }
          if (!$result) {
            return FALSE;