Consistent use of BannedPhoto, closes #1579
erge branch '2.1' of github.com:vanillaforums/Garden into 2.1