From a7a87913befddd7b1ab8e0b4ab0e563e7927950b Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 7 Aug 2009 18:26:12 -0400 Subject: 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 --- lib/noticelist.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/noticelist.php') 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', -- cgit v1.2.3-54-g00ecf