hook_user Causing PHP notices

When calling hook_user with $category = 'register', drupal makes all arguments ($edit, $account, ...) null. However, in function user_register_data(), called by civicrm_user(), it assumes that the $account object or in this case, the $user object, is an object, which causes php notices.

Also in the function user_register_data(), the variable $userID is assumed to be populated when it's not in the "else" statement.

I'm not very familiar with svn or civicrm version control practices, so I may have checked out an outdated version of code, but I think I got the latest version when I applied the patch.