diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-23 12:13:32 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-23 12:13:32 -0700 |
| commit | 7277b59734cf0e39c8c77e01b13e8d997533bacf (patch) | |
| tree | 18bc14d3ead88c649328c8354a3690b1c2491260 /lib | |
| parent | fcdbf421ab2bbbe4d1b601a8c80d4612c91f62fe (diff) | |
| parent | 44caa3a93f452777c795006edb52ef4c5c2c4997 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 3 |
2 files changed, 3 insertions, 2 deletions
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 |