summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-03-18 09:49:31 +0000
committerDries Buytaert <dries@buytaert.net>2009-03-18 09:49:31 +0000
commit7feb58e5a6680de521306c61cf27eb7226fb09d1 (patch)
treed0e738d8f791806749078fe4bc70f844cf092aa3
parentb59c662967c24e4b7946ba740bc5ba63c63eb1e4 (diff)
downloadbrdo-7feb58e5a6680de521306c61cf27eb7226fb09d1.tar.gz
brdo-7feb58e5a6680de521306c61cf27eb7226fb09d1.tar.bz2
- Patch #394488 by Dave Reid: corrected some database conversions.
-rw-r--r--modules/openid/openid.pages.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc
index 7018676f1..2f361a9b6 100644
--- a/modules/openid/openid.pages.inc
+++ b/modules/openid/openid.pages.inc
@@ -89,7 +89,7 @@ function openid_user_add_validate($form, &$form_state) {
* Menu callback; Delete the specified OpenID identity from the system.
*/
function openid_user_delete_form($form_state, $account, $aid = 0) {
- $authname = db_query('SELECT authname FROM {authmap} WHERE uid = :uid AND aid = :aid', array(
+ $authname = db_query("SELECT authname FROM {authmap} WHERE uid = :uid AND aid = :aid AND module = 'openid'", array(
':uid' => $account->uid,
':aid' => $aid,
))
@@ -99,12 +99,12 @@ function openid_user_delete_form($form_state, $account, $aid = 0) {
function openid_user_delete_form_submit(&$form_state, $form_values) {
$query = db_delete('authmap')
- ->condition('uid', $form_state['#parameters'][2]->uid)
- ->condition('aid', $form_state['#parameters'][3])
+ ->condition('uid', $form_state['#args'][0]->uid)
+ ->condition('aid', $form_state['#args'][1])
+ ->condition('module', 'openid')
->execute();
if ($query) {
drupal_set_message(t('OpenID deleted.'));
}
$form_state['#redirect'] = 'user/'. $form_state['#args'][0]->uid .'/openid';
}
-