diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:27:43 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:27:43 -0400 |
| commit | 9f356b55c6f419468771c0f3c2450010c0242abe (patch) | |
| tree | 4cd175c7ef96380b5be82722581d63cf2f2fcb30 /lib/noticelist.php | |
| parent | 5dc1291b59a1079cbe9bab05d12dae06b8e4c96d (diff) | |
| parent | a645d0468b368c7c659b440f72ec80498055ac3e (diff) | |
Merge branch '0.9.x' into openidplugin
Conflicts:
actions/login.php
actions/register.php
Diffstat (limited to 'lib/noticelist.php')
| -rw-r--r-- | lib/noticelist.php | 7 |
1 files changed, 3 insertions, 4 deletions
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', |