Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / actions / apitimelineretweetedtome.php

diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index 681b0b9e9ed8e67d5d20dda76718925244f54ad1..6213a08eac05f84e457ae34508864e59f23b3a17 100644 (file)
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -42,7 +42,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiTimelineRetweetedToMeAction extends ApiAuthAction
 {
     const DEFAULTCOUNT = 20;
@@ -61,9 +60,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -88,7 +85,6 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -108,18 +104,33 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
         case 'atom':
             $profile    = $this->auth_user->getProfile();
 
+            // TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
             $title      = sprintf(_("Repeated to %s"), $this->auth_user->nickname);
-            $taguribase = common_config('integration', 'taguri');
+            $taguribase = TagURI::base();
             $id         = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id;
             $link       = common_local_url('all',
                                            array('nickname' => $this->auth_user->nickname));
 
             $this->showAtomTimeline($strm, $title, $id, $link);
             break;
-
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            // TRANS: Client error displayed when trying to handle an unknown API method.
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
 }