Patches
Plain Diff
Not ideal, vars in userinfo would need a lot of renaming to make it easier to understand. issue #6054