WHERE clause not applied when using filter Internationalization: Selection in Views

I found the filter was not being applied due to a check in i18n.module.

// If language conditions already there, get out
if (preg_match("/i18n/", $query)) return;

This blocked execution of the where-modifying code just below it. I removed it and protected the JOIN addition below so it's not added twice (severe breakage ensued).

I do not know if this is a big no-no but I thought I'd put it out in the open. It has the possibility of adding the WHERE parts twice... I attach the (tiny) diff.