Content Negotiation filter doesn't work properly when embedding views in nodes

I've come across an issue with i18nviews that affects views which are embedded directly on a node, and also blocks which are visible on node pages. It seems that i18n_selection_mode() automatically chooses 'node' when you are viewing a node regardless of what your content selection mode is set to. This means i18n_db_rewrite_where will always use the 'node' rewrite conditions.

We have gotten around this by modifying content_negotiation_filter_handler.inc with the attached patch to force it to pass on the proper selection mode instead of relying on the one generated by 18n_db_rewrite_where.

If anyone has any feedback or potential pitfalls of this patch please reply and discuss