We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit ae557ed4 authored by Zach Copley's avatar Zach Copley

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

parents 3913b6a5 6841a8d0
......@@ -157,7 +157,7 @@ class RegisterThrottlePlugin extends Plugin
$ids = Registration_ip::usersByIP($ipaddress);
foreach ($ids as $id) {
$profile = Profile::staticGet('id', $id);
if ($profile->isSilenced()) {
if ($profile && $profile->isSilenced()) {
throw new Exception(_("A banned user has registered from this address."));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment