Manually apply PR #2656

Fixes an 'Array to string conversion' notice in form_dropdown()