summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-08-07 08:41:24 +0000
committerDries Buytaert <dries@buytaert.net>2007-08-07 08:41:24 +0000
commita21275a58f5eecb8fac93010042a726e5d76e2c5 (patch)
tree76490913c40f39084002ed19398747b146437c36
parentf23c24c8a31ea3787d5039d36de56001f731e22a (diff)
downloadbrdo-a21275a58f5eecb8fac93010042a726e5d76e2c5.tar.gz
brdo-a21275a58f5eecb8fac93010042a726e5d76e2c5.tar.bz2
- Patch #165160 by hswong3i: made two SQL queries work on DB2.
-rw-r--r--includes/bootstrap.inc2
-rw-r--r--includes/menu.inc2
-rw-r--r--modules/taxonomy/taxonomy.module2
3 files changed, 3 insertions, 3 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 93a35f041..32721b921 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -822,7 +822,7 @@ function drupal_is_denied($type, $mask) {
// (allowed).
// The use of ORDER BY / LIMIT is more efficient than "MAX(status) = 0"
// in PostgreSQL <= 8.0.
- return (bool) db_result(db_query_range("SELECT CASE WHEN status=1 THEN 0 ELSE 1 END FROM {access} WHERE type = '%s' AND LOWER('%s') LIKE LOWER(mask) ORDER BY status DESC", $type, $mask, 0, 1));
+ return (bool) db_result(db_query_range("SELECT CASE WHEN status=1 THEN 0 ELSE 1 END FROM {access} WHERE type = '%s' AND LOWER(mask) LIKE LOWER('%s') ORDER BY status DESC", $type, $mask, 0, 1));
}
/**
diff --git a/includes/menu.inc b/includes/menu.inc
index 72b2d5327..2b2cd4668 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1679,7 +1679,7 @@ function _menu_link_move_children($item, $existing_item) {
}
elseif ($shift > 0) {
// The order of $set must be reversed so the new values don't overwrite the
- // old ones before they can be used because "Single-table UPDATE
+ // old ones before they can be used because "Single-table UPDATE
// assignments are generally evaluated from left to right"
// see: http://dev.mysql.com/doc/refman/5.0/en/update.html
$set = array_reverse($set);
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index c7eaacc7c..923297b8e 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -821,7 +821,7 @@ function _taxonomy_term_children($tid) {
* An array of matching term objects.
*/
function taxonomy_get_term_by_name($name) {
- $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.* FROM {term_data} t WHERE LOWER('%s') LIKE LOWER(t.name)", 't', 'tid'), trim($name));
+ $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.* FROM {term_data} t WHERE LOWER(t.name) LIKE LOWER('%s')", 't', 'tid'), trim($name));
$result = array();
while ($term = db_fetch_object($db_result)) {
$result[] = $term;