Commit 259a262d authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'master' of gitorious.org:statusnet/mainline

parents b475c871 98acec74
......@@ -127,6 +127,7 @@ abstract class ProfileBlock extends Widget
if (!empty($homepage)) {
$this->out->element('a',
array('href' => $homepage,
'rel' => 'me',
'class' => 'profile_block_homepage'),
$homepage);
}
......
......@@ -223,6 +223,7 @@ class RegisterThrottlePlugin extends Plugin
private function _getIpAddress()
{
$keys = array('HTTP_X_FORWARDED_FOR',
'HTTP_X_CLIENT',
'CLIENT-IP',
'REMOTE_ADDR');
......
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