diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 13:06:40 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 13:06:40 -0700 |
| commit | 5c4723919fa757b3e14a59350415cfe53e0900d1 (patch) | |
| tree | 41383884e14ffb429dec088b490f639578085693 /actions | |
| parent | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (diff) | |
| parent | de185a14057e52d6acd306a643eb8f38cd83973e (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/shownotice.php | 2 | ||||
| -rw-r--r-- | actions/showstream.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 1161de863..93d056aca 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -297,7 +297,7 @@ class ShownoticeAction extends OwnerDesignAction $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); $avatarUrl = ($avatar) ? $avatar->displayUrl() : - Avatar::defaultImage($avatar_size); + Avatar::defaultImage(AVATAR_PROFILE_SIZE); $this->element('meta', array('property' => 'og:image', 'content' => $avatarUrl)); $this->element('meta', array('property' => 'og:description', diff --git a/actions/showstream.php b/actions/showstream.php index 744b6906e..b2082eb4b 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -216,7 +216,10 @@ class ShowstreamAction extends ProfileAction ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); - $pnl = new ProfileNoticeList($notice, $this); + $pnl = null; + if (Event::handle('ShowStreamNoticeList', array($notice, $this, &$pnl))) { + $pnl = new ProfileNoticeList($notice, $this); + } $cnt = $pnl->show(); if (0 == $cnt) { $this->showEmptyListMessage(); |