summaryrefslogtreecommitdiff
path: root/actions/noticesearch.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-06 15:38:10 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-06 15:38:10 -0500
commit02d7167906b63d490db3b5c3848accc5235b220f (patch)
tree92323dec8d456fdc737ee3a74c48dedf4cb92bcd /actions/noticesearch.php
parentd260d841ebae71acf7bf726f52acaa6391ce1824 (diff)
parent60f737dc1eb2f126bae28ce095bc2d17a22bd7d9 (diff)
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'actions/noticesearch.php')
-rw-r--r--actions/noticesearch.php24
1 files changed, 13 insertions, 11 deletions
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index a0d723b12..a5f01350c 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -48,6 +48,16 @@ require_once INSTALLDIR.'/lib/searchaction.php';
*/
class NoticesearchAction extends SearchAction
{
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ common_set_returnto($this->selfUrl());
+
+ return true;
+ }
+
/**
* Get instructions
*
@@ -154,8 +164,9 @@ class NoticesearchAction extends SearchAction
$this->elementStart('div', 'entry-title');
$this->elementStart('span', 'vcard author');
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
- $this->elementStart('a', array('href' => $profile->profileurl));
- $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+ $this->elementStart('a', array('href' => $profile->profileurl,
+ 'class' => 'url'));
+ $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
'class' => 'avatar photo',
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
@@ -223,15 +234,6 @@ class NoticesearchAction extends SearchAction
$this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
-
- $this->elementStart('a',
- array('href' => common_local_url('newnotice',
- array('replyto' => $profile->nickname)),
- 'onclick' => 'doreply("'.$profile->nickname.'"); return false',
- 'title' => _('reply'),
- 'class' => 'replybutton'));
- $this->hidden('posttoken', common_session_token());
- $this->elementEnd('a');
$this->elementEnd('div');
$this->elementEnd('li');
}