Wikia/app — pull request #5755 by aquilax (2014-12-12 08:29:25+00:00)
Title: CONN-642: Global block overwrites local allowence

Global edit block must prevail over local allowance. Also removed `WallController::checkAndSetUserBlockedStatus` as it is the same as `WallBaseController::checkAndSetUserBlockedStatus` and `WallController` inherits `WallBaseController`.

/cc @nandy-andy care to take a look :oncoming_automobile: