- Patch #525504 by Dave Reid, gpk: anonymous user should not have contact form.

1 files changed, 20 insertions, 2 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index 1e0afc923..26064f886 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1557,12 +1557,30 @@ function user_menu() {
   return $items;
 }
 
+/**
+ * Implement hook_init().
+ */
 function user_init() {
   drupal_add_css(drupal_get_path('module', 'user') . '/user.css');
 }
 
-function user_uid_optional_load($arg) {
-  return user_load(isset($arg) ? $arg : $GLOBALS['user']->uid);
+/**
+ * Load a either a specified or the current user account.
+ *
+ * @param $uid
+ *   An optional user ID of the user to load. If not provided, the current
+ *   user's ID will be used.
+ * @return
+ *   A fully-loaded $user object upon successful user load, FALSE if user
+ *   cannot be loaded.
+ *
+ * @see user_load()
+ */
+function user_uid_optional_load($uid = NULL) {
+  if (!isset($uid)) {
+    $uid = $GLOBALS['user']->uid;
+  }
+  return user_load($uid);
 }
 
 /**