summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-01-13 23:19:54 +0000
committerDries Buytaert <dries@buytaert.net>2010-01-13 23:19:54 +0000
commitf60739b033efb6fc47e07bd7732fecf8222793c0 (patch)
tree8d814d27d0c22d5fb310f4b64984385b53fbb16f /includes
parent6a5532a2589463de93cc96ce6b71a7af94d39d9b (diff)
downloadbrdo-f60739b033efb6fc47e07bd7732fecf8222793c0.tar.gz
brdo-f60739b033efb6fc47e07bd7732fecf8222793c0.tar.bz2
- Patch #683736 by c960657: use db_like() where appropriate.
Diffstat (limited to 'includes')
-rw-r--r--includes/cache.inc2
-rw-r--r--includes/locale.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/includes/cache.inc b/includes/cache.inc
index cbefdd2a3..b45d26b27 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -462,7 +462,7 @@ class DrupalDatabaseCache implements DrupalCacheInterface {
}
else {
db_delete($this->bin)
- ->condition('cid', $cid . '%', 'LIKE')
+ ->condition('cid', db_like($cid) . '%', 'LIKE')
->execute();
}
}
diff --git a/includes/locale.inc b/includes/locale.inc
index e9197f46e..a40a7d125 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -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;