CVE-2012-5664 options hashes should only be extracted if there are extra parameters

Conflicts:
	activerecord/lib/active_record/dynamic_matchers.rb