Debugging log fix.

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatustag.php

diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php
index 7a3be739c7fe295d078b1417602bda755fe86847..99d4a6735c6da19b527d502e6d7176ffaff78655 100644 (file)
--- a/plugins/OStatus/actions/ostatustag.php
+++ b/plugins/OStatus/actions/ostatustag.php
@@ -31,14 +31,13 @@ class OStatusTagAction extends OStatusInitAction
     var $profile;
     var $err;
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
 
         if (common_logged_in()) {
             // TRANS: Client error displayed when trying to list a local object as if it is remote.
             $this->clientError(_m('You can use the local list functionality!'));
-            return false;
         }
 
         $this->nickname = $this->trimmed('nickname');
@@ -74,7 +73,7 @@ class OStatusTagAction extends OStatusInitAction
         // TRANS: Field label.
         $this->input('profile', _m('Profile Account'), $this->profile,
                      // TRANS: Field title.
-                     _m('Your account id (for example user@identi.ca).'));
+                     _m('Your account id (for example user@example.com).'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', $submit);
@@ -92,7 +91,11 @@ class OStatusTagAction extends OStatusInitAction
         $link = $xrd->get('http://ostatus.org/schema/1.0/tag');
         if (!is_null($link)) {
             // We found a URL - let's redirect!
-            $url = Discovery::applyTemplate($link->template, $target_profile);
+            if (!empty($link->template)) {
+                $url = Discovery::applyTemplate($link->template, $target_profile);
+            } else {
+                $url = $link->href;
+            }
             common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
             common_redirect($url, 303);
         }