summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-05 16:51:30 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-05 16:51:30 +0000
commit526558401680f5d8b402823dbd5d40fd17620980 (patch)
treef65e822fb4e8eb83e0e16816dd80213fe3916530 /modules
parent89f2567961f41887e8cd8d03e56f70b5ba75694a (diff)
downloadbrdo-526558401680f5d8b402823dbd5d40fd17620980.tar.gz
brdo-526558401680f5d8b402823dbd5d40fd17620980.tar.bz2
- Patch #769554 by jpmckinney, Berdir, cha0s: fixed trivial SQL injection(s) with SelectQuery.
Diffstat (limited to 'modules')
-rw-r--r--modules/openid/openid.module2
-rw-r--r--modules/simpletest/tests/database_test.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index ebd63f0bb..45b6714b2 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -550,7 +550,7 @@ function openid_association($op_endpoint) {
// Remove Old Associations:
db_delete('openid_association')
- ->condition('created + expires_in', REQUEST_TIME, '<')
+ ->where('created + expires_in < :request_time', array(':request_time' => REQUEST_TIME))
->execute();
// Check to see if we have an association for this IdP already
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index 1005553d4..09c310cd5 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -1835,7 +1835,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
$task_field = $query->addField('t', 'task');
$query->orderBy($count_field);
$query->groupBy($task_field);
- $query->havingCondition('COUNT(task)', 2, '>=');
+ $query->having('COUNT(task) >= 2');
$result = $query->execute();
$num_records = 0;