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

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 8f73dc824af6d6180fab885c571b7c265d8ebf0e..4b179bc72b3eb94b9422a9ae1e135c1fde508b46 100644 (file)
--- 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 a8d5059ca49bb443c17c21caf93c6fe02af8e150..5429d943f14b8039977d62aa2d44d0506855305b 100644 (file)
--- 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',