Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.869
diff -u -r1.869 user.module
--- modules/user/user.module	8 Dec 2007 14:06:22 -0000	1.869
+++ modules/user/user.module	12 Dec 2007 20:59:29 -0000
@@ -15,7 +15,7 @@
  * We cannot use module_invoke() for this, because the arguments need to
  * be passed by reference.
  */
-function user_module_invoke($type, &$array, &$user, $category = NULL) {
+function user_invoke($type, &$array, &$user, $category = NULL) {
   foreach (module_list() as $module) {
     $function = $module .'_user';
     if (function_exists($function)) {
@@ -173,7 +173,7 @@
     while ($role = db_fetch_object($result)) {
       $user->roles[$role->rid] = $role->name;
     }
-    user_module_invoke('load', $array, $user);
+    user_invoke('load', $array, $user);
   }
   else {
     $user = FALSE;
@@ -200,7 +200,7 @@
   // Dynamically compose a SQL query:
   $user_fields = user_fields();
   if (is_object($account) && $account->uid) {
-    user_module_invoke('update', $array, $account, $category);
+    user_invoke('update', $array, $account, $category);
     $query = '';
     $data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid)));
     // Consider users edited by an administrator as logged in, if they haven't
@@ -268,7 +268,7 @@
       _user_mail_notify($op, $user);
     }
 
-    user_module_invoke('after_update', $array, $user, $category);
+    user_invoke('after_update', $array, $user, $category);
   }
   else {
     if (!isset($array['created'])) {    // Allow 'created' to be set by the caller
@@ -312,7 +312,7 @@
     // Build the initial user object.
     $user = user_load(array('uid' => $array['uid']));
 
-    user_module_invoke('insert', $array, $user, $category);
+    user_invoke('insert', $array, $user, $category);
 
     // Build and save the serialized data field now
     $data = array();
@@ -614,7 +614,7 @@
   }
 }
 
-function user_login_block() {
+function user_login_block_form() {
   $form = array(
     '#action' => url($_GET['q'], array('query' => drupal_get_destination())),
     '#id' => 'user-login-form',
@@ -700,7 +700,7 @@
         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;
 
@@ -1088,6 +1088,9 @@
   return $items;
 }
 
+/**
+ * Implementation of hook_init().
+ */
 function user_init() {
   drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'module');
 }
@@ -1301,7 +1304,7 @@
     // Update the user table timestamp noting user has logged in.
     db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
 
-    user_module_invoke('login', $form_state['values'], $user);
+    user_invoke('login', $form_state['values'], $user);
 
     sess_regenerate();
     $form_state['redirect'] = 'user/'. $user->uid;
@@ -1490,7 +1493,7 @@
  */
 function user_build_content(&$account) {
   $edit = NULL;
-  user_module_invoke('view', $edit, $account);
+  user_invoke('view', $edit, $account);
   // Allow modules to modify the fully-built profile.
   drupal_alter('profile', $account);
 
@@ -2043,8 +2046,6 @@
   }
 }
 
-
-
 /**
  * Implementation of hook_hook_info().
  */
@@ -2299,7 +2300,7 @@
 }
 
 function user_register_validate($form, &$form_state) {
-  user_module_invoke('validate', $form_state['values'], $form_state['values'], 'account');
+  user_invoke('validate', $form_state['values'], $form_state['values'], 'account');
 }
 
 /**
@@ -2316,4 +2317,3 @@
 
   return empty($groups) ? FALSE : $groups;
 }
-