Cannot add multiple roles on order

When purchasing an order that has more then one user role only one role in the order gets added to the account, I believe that all the role expiration stuff from uc_roles works correctly, but it is just the adding of the actually role to an account to results in an error.

I believe the reason for this error is that the same reference to the user $account object is being passed around without updating to include the new roles, so the last added role will always win and the rest do not get added.

Here is the offending code:

function uc_roles_grant($account, $rid, $timestamp, $save_user = TRUE) {

  // First, delete any previous record of this user/role association.
  uc_roles_delete($account, $rid);

  if ($save_user) {
    // Punch the role into the user object.
    $roles_list = $account->roles + array($rid => _uc_roles_get_name($rid));
    user_save($account, array('roles' => $roles_list));
  }

Updating the roles in the $account object as they are also saved to the DB ensures that it will keep track of all roles that should be added, and subsequent calls to this function will not override the previous actions:

function uc_roles_grant($account, $rid, $timestamp, $save_user = TRUE) {

  // First, delete any previous record of this user/role association.
  uc_roles_delete($account, $rid);

  if ($save_user) {
    // Punch the role into the user object.
    $roles_list = $account->roles + array($rid => _uc_roles_get_name($rid));
    $account->roles=$roles_list;
    user_save($account, array('roles' => $roles_list));
  }

It looks like this error previous existed and was fixed back here: (but has somehow crept back in)
http://www.ubercart.org/forum/bug_reports/2019/uc_roles_fail_when_settin...