Merge branch 'testing' into 0.9.x

diff --combined actions/shownotice.php
index a1933ff631d6e287110f0272d761749bb5eee0a7,a23027f7c5f6858f308008c647c9e21fe576691e..ca6b60d1f59b15de87d5f047002fffbc5ebd0591
--- 1/actions/shownotice.php
--- 2/actions/shownotice.php
+++ b/actions/shownotice.php
@@@ -103,11 -103,6 +103,6 @@@ class ShownoticeAction extends OwnerDes
  
          $this->user = User::staticGet('id', $this->profile->id);
  
-         if ($this->notice->is_local == Notice::REMOTE_OMB) {
-             common_redirect($this->notice->uri);
-             return false;
-         }
- 
          $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
  
          return true;
@@@ -172,7 -167,7 +167,7 @@@
      function title()
      {
          if (!empty($this->profile->fullname)) {
 -            $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
 +            $base = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
          } else {
              $base = $this->profile->nickname;
          }
@@@ -198,13 -193,20 +193,20 @@@
  
          if ($this->notice->is_local == Notice::REMOTE_OMB) {
              if (!empty($this->notice->url)) {
-                 common_redirect($this->notice->url, 301);
+                 $target = $this->notice->url;
              } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
-                 common_redirect($this->notice->uri, 301);
+                 // Old OMB posts saved the remote URL only into the URI field.
+                 $target = $this->notice->uri;
+             } else {
+                 // Shouldn't happen.
+                 $target = false;
+             }
+             if ($target && $target != $this->selfUrl()) {
+                 common_redirect($target, 301);
+                 return false;
              }
-         } else {
-             $this->showPage();
          }
+         $this->showPage();
      }
  
      /**