Unprotected images (and presumably unprotected files) cause SQL errors when referenced in a node.

The site under development has been upgraded from 5.x to 6.2.

When unprotected images are displayed on pages, protected_node_file_download throws errors. It looks like uploaded files would also throw errors for the same reason.

For images, the error reported is unknown column f.nid in the query SELECT n.nid FROM files f, protected_nodes pn, node n WHERE pn.nid = f.nid AND f.nid = n.nid AND f.filename = 'images/WRAT.thumbnail.jpg'

Changing the code as follows prevents the error, but may be the wrong way to accomplish the purpose of the function and may not be portable for all types of uploaded files. I'm running private files, so I had to use a $path to match the image name.

$path = file_directory_path();
$db_file = db_result(db_query('SELECT i.nid FROM {files} f, {image} i, {protected_nodes} pn WHERE pn.nid = i.nid AND i.fid = f.fid AND f.filepath = \'%s/%s\'', $path, $file));

if(db_error() || $db_file === FALSE) {
$db_file = db_result(db_query('SELECT u.nid FROM {files} f, {upload} u, {protected_nodes} pn WHERE pn.nid = u.nid AND u.fid = f.fid AND f.filepath = \'%s/%s\'', $path, $file));
}

I'm pretty sure there weren't any issues for this in 5.x.