$user->roles problem in og_user_roles_all_roles when using hook og_user_roles_user

This bug only happens in certain situations, especially when you have changed the weights of the og_user_roles module.

The problem lays with the static $querie_results in function og_user_roles_all_roles and the 'load' 'op' in og_user_roles_user, let me explain in the next part of my report.

Btw all code in this report are taken from og_user_roles.module and are used to explain the problem.

og_user_roles_all_roles is called each time by the init hook; og_user_roles_init. Which is fine. It sets the static with the last result of the query based on the given user;

Snip code from og_user_roles_all_roles; (at the end of the function)

    while ($row = db_fetch_array($results)) {
      $x1 = $row['rid'];
      $ogroles[$x1] = $row['name'];
    }
    $querie_results[$uid.'_'.$gid] = $ogroles;

Once the static is set, it prevents the query the next time, but also prevents that $user->roles is not set again with the same roles;
Snip code from og_user_roles_all_roles;

 $c = $user->roles;

  //
  // Next, we add the $user->roles array to the $ogroles array, if there is an ogroles array;
  //
  if ($x1 > 0) {
    $d = array();
    $d = $c + $ogroles;
    $d = array_unique($d);
  }
  else {
    $d = $c;
  }

It returns $d which is copied into $user->roles. So far, so good.

Now when ever hook og_user_roles_user is called with the same user as the user that been set here and with 'op' 'load', the bug happens; og_user_roles_user is called with a reloaded $user, with the unchanged $user->roles;
Snip code from og_user_roles_user;

  // Add the group roles to $user->roles if this is a group
  // This should only be effective until the next global $user call
  if ($op == 'load' && ($GLOBALS['user']->uid == $user->uid || variable_get('user_roles_always_get_roles', 0))) {
    $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any
    $user->roles = $roles;
  } // end $op load

Now if we call og_user_roles_all_roles($user) with the same user as was processed during the hook_init, the user->roles will not be changed. This is now needed because hook_user is called with a clean reloaded user object, and $user->roles is without the og rules previously set.

You can trigger this bug by giving -10 weight on the og_user_roles module (give og 0 weight like default) in the system table. It will then run hook_init before of the og module. The og_init function will load the user, triggering the bug because its called after the hook_init of og_user_roles and with the same user.

Fix options?:
1st; always appended and unique the role array.
2nd; check if one of the og roles is inside $user->roles and if not present; append it.
3rd option is setting $user->og_user_roles_set with true and test if its set and append when missing (which i prefer to be honest).