Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Zach Copley 2010-10-22 11:23:37 -07:00
commit ae557ed436

View File

@ -157,7 +157,7 @@ class RegisterThrottlePlugin extends Plugin
$ids = Registration_ip::usersByIP($ipaddress); $ids = Registration_ip::usersByIP($ipaddress);
foreach ($ids as $id) { foreach ($ids as $id) {
$profile = Profile::staticGet('id', $id); $profile = Profile::staticGet('id', $id);
if ($profile->isSilenced()) { if ($profile && $profile->isSilenced()) {
throw new Exception(_("A banned user has registered from this address.")); throw new Exception(_("A banned user has registered from this address."));
} }
} }