eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

User object didn't have getNickname() function

Browse Source 
We're just jumping on to the Profile->getNickname() function.
This commit is contained in:
Mikael Nordfeldth 2014-05-06 16:08:36 +02:00
parent 869ca2d20b
commit 8b12e41351
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/User.php
View File

@ -137,6 +137,11 @@ class User extends Managed_DataObject
return $this->uri; return $this->uri;
} }
public function getNickname()
{
return $this->getProfile()->getNickname();
}
function isSubscribed(Profile $other) function isSubscribed(Profile $other)
{ {
return $this->getProfile()->isSubscribed($other); return $this->getProfile()->isSubscribed($other);

1
extlib/DB/DataObject.php
View File

@ -4309,6 +4309,7 @@ class DB_DataObject extends DB_DataObject_Overload
$case[strtolower($k)] = $k; $case[strtolower($k)] = $k;
} }
if ((substr(phpversion(),0,1) == 5) && isset($case[strtolower($element)])) { if ((substr(phpversion(),0,1) == 5) && isset($case[strtolower($element)])) {
file_put_contents('/tmp/backtrace', var_export(debug_backtrace(),true));
trigger_error("PHP5 set/get calls should match the case of the variable",E_USER_WARNING); trigger_error("PHP5 set/get calls should match the case of the variable",E_USER_WARNING);
$element = strtolower($element); $element = strtolower($element);
} }

2
plugins/OStatus/actions/usersalmon.php
View File

@ -89,7 +89,7 @@ class UsersalmonAction extends SalmonAction
// In reply to a notice either from or mentioning this user. // In reply to a notice either from or mentioning this user.
} else if (!empty($context->attention) && } else if (!empty($context->attention) &&
(array_key_exists($this->user->uri, $context->attention) || (array_key_exists($this->user->uri, $context->attention) ||
array_key_exists($common_profile_url($this->user->nickname), array_key_exists($common_profile_url($this->user->getNickname()),
$context->attention))) $context->attention)))
{ {
// To the attention of this user. // To the attention of this user.