ArticleComments / Wall: wrap Bucky calls in if statement

This is The Quick&Ugly Fix (TM) for P2

Backporting #5208