Incompatability with i18n

We found an issue using profile_privacy with i18n.

The profile_privacy module sets privileged-only fields to NULL in hook_user() instead of unsetting them. Because of this, profile_privacy is adding fields to $user->content that would not be there if the profile_privacy module was not enabled.

When the $account object with these NULL values is passed to i18nstrings.module it throws the error:

warning: Cannot use a scalar value as an array in /home/sonybmg/d6-live/public_html/sites/all/modules/contrib/i18n/i18nstrings/i18nstrings.module on line 727.

because there's a NULL value where it's expecting an array. Unsetting prevents this error because that field is no longer passed.

Attached is a patch.

Thanks to alevine for the help debugging.

Existing code:

          // Over ride the default profile behavior. If a field is only available
          // to "privileged users" unset the variable entirely. This affects
          // all themed versions 
          elseif ($field->visibility == PROFILE_PRIVATE) {
            $account->{$field->name} = NULL;
            $account->content[$field->category][$field->name] = NULL;
          }

new code:

          // Over ride the default profile behavior. If a field is only available
          // to "privileged users" unset the variable entirely. This affects
          // all themed versions 
          elseif ($field->visibility == PROFILE_PRIVATE) {
            if (isset($account->{$field->name})) {
              unset($account->{$field->name});
            }
            if (isset($account->{$field->name})) {
              unset($account->content[$field->category][$field->name]);
            }
          }