Unknown column 'n.type' in 'where clause' when viewing admin/content/files

The view unpublished module has a conflict with the latest version of the file_entity module.

This is because the view_unpublished_query_alter() function is not specific enough in what it alters and it alters and breaks the file entity listing sql.

To reproduce, go to admin/content/files, with an admin that is allowed to see it (not user 1) and you get the message:

"The website encountered an unexpected error. Please try again later."

And this error:
PDOException: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'n.type' in 'where clause': SELECT COUNT(*) AS expression FROM (SELECT 1 AS expression FROM {file_managed} f INNER JOIN {users} u ON f.uid = u.uid WHERE (f.status = :db_condition_placeholder_0) AND (f.uri NOT LIKE :db_condition_placeholder_1 ESCAPE '\\') AND( (n.type = :db_condition_placeholder_2) OR (n.type = :db_condition_placeholder_3) OR (n.type = :db_condition_placeholder_4) OR (n.type = :db_condition_placeholder_5) OR (n.type = :db_condition_placeholder_6) )) subquery; Array ( [:db_condition_placeholder_0] => 1 [:db_condition_placeholder_1] => temporary% [:db_condition_placeholder_2] => case_studies [:db_condition_placeholder_3] => documents [:db_condition_placeholder_4] => individual_board_committees [:db_condition_placeholder_5] => page [:db_condition_placeholder_6] => profile ) in PagerDefault->execute() (line 74 of /home/mysite/public_html/includes/pager.inc).

The code that generates the original query that is being altered is in the file entity module in file_entity_admin_files().