diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-08-07 18:26:12 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-08-07 18:26:12 -0400 |
| commit | a7a87913befddd7b1ab8e0b4ab0e563e7927950b (patch) | |
| tree | f34b4e01ba65ced97017ab6cc7d0610c4d079cd6 | |
| parent | 11086c78239a30dc47622837a2800d899ebf9b0f (diff) | |
Redirect instead of showing an error when the user visits a non-local notice's url
Use consistent logic in display non-local notice links
Fixes http://laconi.ca/trac/ticket/1788
| -rw-r--r-- | actions/shownotice.php | 4 | ||||
| -rw-r--r-- | lib/noticelist.php | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 8f73dc824..4b179bc72 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -97,8 +97,8 @@ class ShownoticeAction extends OwnerDesignAction $this->user = User::staticGet('id', $this->profile->id); - if (empty($this->user)) { - $this->serverError(_('Not a local notice'), 500); + if (! $this->notice->is_local) { + common_redirect($this->notice->uri); return false; } diff --git a/lib/noticelist.php b/lib/noticelist.php index a8d5059ca..5429d943f 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -350,11 +350,10 @@ class NoticeListItem extends Widget function showNoticeLink() { - $noticeurl = common_local_url('shownotice', + if($this->notice->is_local){ + $noticeurl = common_local_url('shownotice', array('notice' => $this->notice->id)); - // XXX: we need to figure this out better. Is this right? - if (strcmp($this->notice->uri, $noticeurl) != 0 && - preg_match('/^http/', $this->notice->uri)) { + }else{ $noticeurl = $this->notice->uri; } $this->out->elementStart('a', array('rel' => 'bookmark', |