diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-25 13:50:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-25 13:50:49 -0400 |
| commit | 920acf8d966a11b7c461c333b3a5d3c82d9c8d75 (patch) | |
| tree | 396dc88352d080b5ac98f7785be18a81b7eb01e2 /lib | |
| parent | ad608ab9add1615d6aae3fde239e54d1eb36b0ca (diff) | |
| parent | a954fd65ba00328cd1a76e620113d2f639340aaf (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/apiaction.php | 2 | ||||
| -rw-r--r-- | lib/command.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index e6aaf9316..9fc1a0779 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1273,7 +1273,7 @@ class ApiAction extends Action if (empty($local)) { return null; } else { - return User_group::staticGet('id', $local->id); + return User_group::staticGet('id', $local->group_id); } } diff --git a/lib/command.php b/lib/command.php index f7421269d..216f9e649 100644 --- a/lib/command.php +++ b/lib/command.php @@ -273,7 +273,7 @@ class FavCommand extends Command function handle($channel) { $notice = $this->getNotice($this->other); - $fave = Fave::addNew($this->user, $notice); + $fave = Fave::addNew($this->user->getProfile(), $notice); if (!$fave) { $channel->error($this->user, _('Could not create favorite.')); diff --git a/lib/util.php b/lib/util.php index a30d69100..795997868 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1529,7 +1529,8 @@ function common_user_uri(&$user) function common_notice_uri(&$notice) { return common_local_url('shownotice', - array('notice' => $notice->id)); + array('notice' => $notice->id), + null, null, false); } // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits |