From d5d9485b802026de17a02510d163f8393d30cca1 Mon Sep 17 00:00:00 2001
From: Bob Vincent <bobvin@pillars.net>
Date: Wed, 25 May 2011 15:18:51 -0400
Subject: [PATCH] Issue #200344 by Pancho, pillarsdotnet: Rename user_module_invoke() to user_invoke() and user_login_block() to user_login_block_form()

---
 modules/openid/openid.module |    2 +-
 modules/user/user.module     |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index e3128665a0e36a38f87608f306f7376ac5723df2..af74003a319401cf98289b01e077556569941c16 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -122,7 +122,7 @@ function openid_user_logout($account) {
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function openid_form_user_login_block_alter(&$form, &$form_state) {
+function openid_form_user_login_block_form_alter(&$form, &$form_state) {
   _openid_user_login_form_alter($form, $form_state);
 }
 
diff --git a/modules/user/user.module b/modules/user/user.module
index de72bafb740918b4af18c47f3159ec164aa8017b..8cd4f960d5b45d2b827f434af1d96cb2e4c66262 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -79,7 +79,7 @@ function user_help($path, $arg) {
  * We cannot use module_invoke() for this, because the arguments need to
  * be passed by reference.
  */
-function user_module_invoke($type, &$edit, $account, $category = NULL) {
+function user_invoke($type, &$edit, $account, $category = NULL) {
   foreach (module_implements('user_' . $type) as $module) {
     $function = $module . '_user_' . $type;
     $function($edit, $account, $category);
@@ -439,7 +439,7 @@ function user_save($account, $edit = array(), $category = 'account') {
     }
 
     // Invoke hook_user_presave() for all modules.
-    user_module_invoke('presave', $edit, $account, $category);
+    user_invoke('presave', $edit, $account, $category);
 
     // Invoke presave operations of Field Attach API and Entity API. Those APIs
     // require a fully-fledged and updated entity object. Therefore, we need to
@@ -537,7 +537,7 @@ function user_save($account, $edit = array(), $category = 'account') {
           $edit[$key] = $value;
         }
       }
-      user_module_invoke('update', $edit, $account, $category);
+      user_invoke('update', $edit, $account, $category);
       module_invoke_all('entity_update', $account, 'user');
     }
     else {
@@ -562,7 +562,7 @@ function user_save($account, $edit = array(), $category = 'account') {
 
       field_attach_insert('user', $account);
       $edit = (array) $account;
-      user_module_invoke('insert', $edit, $account, $category);
+      user_invoke('insert', $edit, $account, $category);
       module_invoke_all('entity_insert', $account, 'user');
 
       // Save user roles.
@@ -1263,7 +1263,7 @@ function user_user_categories() {
   ));
 }
 
-function user_login_block($form) {
+function user_login_block_form($form) {
   $form['#action'] = url($_GET['q'], array('query' => drupal_get_destination()));
   $form['#id'] = 'user-login-form';
   $form['#validate'] = user_login_default_validators();
@@ -1370,7 +1370,7 @@ function user_block_view($delta = '') {
       if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
 
         $block['subject'] = t('User login');
-        $block['content'] = drupal_get_form('user_login_block');
+        $block['content'] = drupal_get_form('user_login_block_form');
       }
       return $block;
 
@@ -2204,7 +2204,7 @@ function user_login_finalize(&$edit = array()) {
   // or incorrectly does a redirect which would leave the old session in place.
   drupal_session_regenerate();
 
-  user_module_invoke('login', $edit, $user);
+  user_invoke('login', $edit, $user);
 }
 
 /**
-- 
1.7.4.1