Better fix for issue #2257.
Merge branch 'issue-2257' of github.com:evazion/danbooru into issue-2257

Conflicts:
	app/models/post.rb