Wrong default value provided when modifying a title

When I go to node/%node/titles/edit/%tlid, I sometimes get the wrong default value in the text box. I believe this is due to the following code, in line 303 of the 25 Mar 2009 6.x-dev snapshot:

$title = _og_titles_get_title(arg(4));

The problem is that the tlid (i.e. arg(4)) is not a unique primary key for the og_titles table, but rather a composite key with the nid.

I've rolled a patch to solve this problem, which is attached.