diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 88f2a96771..552420d8f6 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -160,7 +160,7 @@ class RegisterThrottlePlugin extends Plugin return true; } - $ri = Registration_ip::getKV('user_id', $profile->id); + $ri = Registration_ip::getKV('user_id', $target->getID()); $ipaddress = null; if ($ri instanceof Registration_ip) { $ipaddress = $ri->ipaddress; @@ -172,12 +172,17 @@ class RegisterThrottlePlugin extends Plugin $action->element('h2', null, _('Registration IP')); + // TRANS: Label for the information about which IP a users registered from. $action->element('strong', null, _('Registered from:')); - $action->element('a', - [ 'class'=>'ipaddress', - 'href'=>common_local_url('ipregistrations', array('ipaddress'=>$ipaddress)), - ], - $ipaddress ?: 'unknown'); + $el = 'span'; + $attrs = ['class'=>'ipaddress']; + if (!is_null($ipaddress)) { + $el = 'a'; + $attrs['href'] = common_local_url('ipregistrations', array('ipaddress'=>$ipaddress)); + } + $action->element($el, $attrs, + // TRANS: Unknown IP address. + $ipaddress ?: _('unknown')); $action->elementEnd('div'); } diff --git a/plugins/RegisterThrottle/actions/ipregistrations.php b/plugins/RegisterThrottle/actions/ipregistrations.php index a748a9d0b2..8d74803ae2 100644 --- a/plugins/RegisterThrottle/actions/ipregistrations.php +++ b/plugins/RegisterThrottle/actions/ipregistrations.php @@ -15,7 +15,7 @@ class IpregistrationsAction extends ManagedAction protected function doPreparation() { - if (!$scoped->hasRight(Right::SILENCEUSER) && !$scoped->hasRole(Profile_role::ADMINISTRATOR)) { + if (!$this->scoped->hasRight(Right::SILENCEUSER) && !$this->scoped->hasRole(Profile_role::ADMINISTRATOR)) { throw new AuthorizationException(_('You are not authorized to view this page.')); }