diff options
| author | Zach Copley <zach@status.net> | 2010-10-22 11:23:37 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-10-22 11:23:37 -0700 |
| commit | ae557ed43643b30e50a6d5b754c53c7f7205e76f (patch) | |
| tree | a590f76719f8a6fb12bee40963d2f5ab36f622ce | |
| parent | 3913b6a5d8fe4b1815d1234989e1287715225fe0 (diff) | |
| parent | 6841a8d09389e6ce0612b63ce831d149e559d254 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
| -rw-r--r-- | plugins/RegisterThrottle/RegisterThrottlePlugin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 369426d33..7e2dde80f 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -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.")); } } |