GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2012-01-21 21:12:53 -05:00
commit 259a262df4
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/profileblock.php
View File

@ -127,6 +127,7 @@ abstract class ProfileBlock extends Widget
if (!empty($homepage)) { if (!empty($homepage)) {
$this->out->element('a', $this->out->element('a',
array('href' => $homepage, array('href' => $homepage,
'rel' => 'me',
'class' => 'profile_block_homepage'), 'class' => 'profile_block_homepage'),
$homepage); $homepage);
} }

1
plugins/RegisterThrottle/RegisterThrottlePlugin.php
View File

@ -223,6 +223,7 @@ class RegisterThrottlePlugin extends Plugin
private function _getIpAddress() private function _getIpAddress()
{ {
$keys = array('HTTP_X_FORWARDED_FOR', $keys = array('HTTP_X_FORWARDED_FOR',
'HTTP_X_CLIENT',
'CLIENT-IP', 'CLIENT-IP',
'REMOTE_ADDR'); 'REMOTE_ADDR');