#619374 by moshe weitzman. Better support for filefields even when imagefield is active on other fields.