Commit f60739b0 authored by Dries's avatar Dries

- Patch #683736 by c960657: use db_like() where appropriate.

parent 6a5532a2
......@@ -462,7 +462,7 @@ function clear($cid = NULL, $wildcard = FALSE) {
}
else {
db_delete($this->bin)
->condition('cid', $cid . '%', 'LIKE')
->condition('cid', db_like($cid) . '%', 'LIKE')
->execute();
}
}
......
......@@ -1480,12 +1480,12 @@ function _locale_translate_seek() {
// Compute LIKE section.
switch ($query['translation']) {
case 'translated':
$sql_query->condition('t.translation', '%' . $query['string'] . '%', 'LIKE');
$sql_query->condition('t.translation', '%' . db_like($query['string']) . '%', 'LIKE');
$sql_query->orderBy('t.translation', 'DESC');
break;
case 'untranslated':
$sql_query->condition(db_and()
->condition('s.source', '%' . $query['string'] . '%', 'LIKE')
->condition('s.source', '%' . db_like($query['string']) . '%', 'LIKE')
->isNull('t.translation')
);
$sql_query->orderBy('s.source');
......@@ -1493,10 +1493,10 @@ function _locale_translate_seek() {
case 'all' :
default:
$condition = db_or()
->condition('s.source', '%' . $query['string'] . '%', 'LIKE');
->condition('s.source', '%' . db_like($query['string']) . '%', 'LIKE');
if ($query['language'] != 'en') {
// Only search in translations if the language is not forced to English.
$condition->condition('t.translation', '%' . $query['string'] . '%', 'LIKE');
$condition->condition('t.translation', '%' . db_like($query['string']) . '%', 'LIKE');
}
$sql_query->condition($condition);
break;
......
......@@ -494,17 +494,17 @@ function field_sql_storage_field_storage_query($field_id, $conditions, $options)
switch ($operator) {
case 'STARTS_WITH':
$operator = 'LIKE';
$value .= '%';
$value = db_like($value) . '%';
break;
case 'ENDS_WITH':
$operator = 'LIKE';
$value = "$value%";
$value = '%' . db_like($value);
break;
case 'CONTAINS':
$operator = 'LIKE';
$value = "%$value%";
$value = '%' . db_like($value) . '%';
break;
}
// Translate field columns into prefixed db columns.
......
......@@ -53,7 +53,7 @@ function profile_browse() {
$query->condition('v.value', $value);
break;
case 'list':
$query->condition('v.value', '%' . $value . '%', 'LIKE');
$query->condition('v.value', '%' . db_like($value) . '%', 'LIKE');
break;
default:
drupal_not_found();
......
......@@ -442,4 +442,4 @@ public function execute()
return $this->query->execute();
}
}
\ No newline at end of file
}
......@@ -813,6 +813,7 @@ protected function buildQuery() {
foreach ($conditions as $key => $condition) {
if ($condition['field'] == 'base.name') {
$conditions[$key]['operator'] = 'LIKE';
$conditions[$key]['value'] = db_like($conditions[$key]['value']);
}
}
}
......
......@@ -102,13 +102,11 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
if (!empty($tags_typed)) {
$query->condition('t.name', $tags_typed, 'NOT IN');
}
// Select rows that match by term name.
$tags_return = $query
->fields('t', array('tid', 'name'))
->condition('t.vid', $vids)
// Select rows that match by term name.
->condition(db_or()
->where("t.name LIKE :last_string", array(':last_string' => '%' . $tag_last . '%'))
)
->condition('t.name', '%' . db_like($tag_last) . '%', 'LIKE')
->range(0, 10)
->execute()
->fetchAllKeyed();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment