2 files changed, 5 insertions, 18 deletions
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index cbfc78dd1..282e2e6c3 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -512,19 +512,6 @@ function hook_image_toolkits() {
 }
 
 /**
- * Perform alterations profile items before they are rendered. You may omit/add/re-sort/re-categorize, etc.
- *
- * @param $account
- *   A user object whose profile is being rendered. Profile items
- *   are stored in $account->content.
- */
-function hook_profile_alter(&$account) {
-  foreach ($account->content AS $key => $field) {
-    // do something
-  }
-}
-
-/**
  * Alter any aspect of email sent by Drupal. You can use this hook
  * to add a common site footer to all outgoing email, add extra header
  * fields, and/or modify the email in any way. HTML-izing the
diff --git a/modules/system/system.module b/modules/system/system.module
index 4834adee7..ea66c8147 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1392,7 +1392,7 @@ function system_preprocess_page(&$variables) {
 /**
  * Implement hook_user_form().
  */
-function system_user_form(&$edit, &$user, $category = NULL) {
+function system_user_form(&$edit, $account, $category) {
   if ($category == 'account') {
     if (variable_get('configurable_timezones', 1)) {
       system_user_timezone($edit, $form);
@@ -1404,7 +1404,7 @@ function system_user_form(&$edit, &$user, $category = NULL) {
 /**
  * Implement hook_user_register().
  */
-function system_user_register(&$edit, &$user, $category = NULL) {
+function system_user_register(&$edit, $account, $category) {
   if (variable_get('configurable_timezones', 1)) {
     $form = array();
     if (variable_get('user_default_timezone', DRUPAL_USER_TIMEZONE_DEFAULT) == DRUPAL_USER_TIMEZONE_SELECT) {
@@ -1423,10 +1423,10 @@ function system_user_register(&$edit, &$user, $category = NULL) {
 /**
  * Implement hook_user_login().
  */
-function system_user_login(&$edit, &$user, $category = NULL) {
+function system_user_login(&$edit, $account) {
   // If the user has a NULL time zone, notify them to set a time zone.
-  if (!$user->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) {
-    drupal_set_message(t('Please configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$user->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+  if (!$account->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) {
+    drupal_set_message(t('Please configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
   }
 }