trunk: Merged [7796] from 0.11-stable (#7258 - Fix for using `$USER` in custom query when `restrict_owner` is enabled by injecting it into the select options.)
Authored by: osimons 2009-01-21
Parent: [r7796]
Child: [r7798]