summaryrefslogtreecommitdiff
path: root/modules/openid
diff options
context:
space:
mode:
Diffstat (limited to 'modules/openid')
-rw-r--r--modules/openid/openid.module8
-rw-r--r--modules/openid/openid.pages.inc2
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index fb390a27d..b4057c463 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -26,7 +26,7 @@ function openid_menu() {
);
$items['user/%user/openid/delete'] = array(
'title' => 'Delete OpenID',
- 'page callback' => 'openid_user_delete',
+ 'page callback' => 'openid_delete_user',
'page arguments' => array(1),
'access callback' => 'user_edit_access',
'access arguments' => array(1),
@@ -58,10 +58,10 @@ function openid_help($path, $arg) {
}
/**
- * Implementation of hook_user().
+ * Implementation of hook_user_insert().
*/
-function openid_user($op, &$edit, &$account, $category = NULL) {
- if ($op == 'insert' && isset($_SESSION['openid']['values'])) {
+function openid_user_insert(&$edit, &$account, $category = NULL) {
+ if (isset($_SESSION['openid']['values'])) {
// The user has registered after trying to login via OpenID.
if (variable_get('user_email_verification', TRUE)) {
drupal_set_message(t('Once you have verified your email address, you may log in via OpenID.'));
diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc
index 57f2687f2..6d8ba2d60 100644
--- a/modules/openid/openid.pages.inc
+++ b/modules/openid/openid.pages.inc
@@ -82,7 +82,7 @@ function openid_user_add_validate($form, &$form_state) {
/**
* Menu callback; Delete the specified OpenID identity from the system.
*/
-function openid_user_delete($account, $aid = 0) {
+function openid_delete_user($account, $aid = 0) {
db_query("DELETE FROM {authmap} WHERE uid=%d AND aid=%d AND module='openid'", $account->uid, $aid);
if (db_affected_rows()) {
drupal_set_message(t('OpenID deleted.'));