Gah and a 302 in the non-exception-handling redirect too

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

diff --git a/actions/rsd.php b/actions/rsd.php
index 921e7584c90139898e0878ac56b2ac6861108fd4..bd8042f0cd86cc3a10945a25b01c8d1f32f11bd2 100644 (file)
--- a/actions/rsd.php
+++ b/actions/rsd.php
@@ -101,10 +101,7 @@ class RsdAction extends Action
             // Permanent redirect on non-canonical nickname
 
             if ($nickname_arg != $nickname) {
-                common_redirect(common_local_url('rsd',
-                                                 array('nickname' => $nickname)),
-                                301);
-                return false;
+                common_redirect(common_local_url('rsd', array('nickname' => $nickname)), 301);
             }
 
             $this->user = User::getKV('nickname', $nickname);
@@ -112,7 +109,6 @@ class RsdAction extends Action
             if (empty($this->user)) {
                 // TRANS: Client error.
                 $this->clientError(_('No such user.'), 404);
-                return false;
             }
         }
 
@@ -155,7 +151,7 @@ class RsdAction extends Action
             $this->elementStart('api', $apiAttrs);
             $this->elementStart('settings');
             $this->element('docs', null,
-                           'http://status.net/wiki/TwitterCompatibleAPI');
+                           common_local_url('doc', array('title' => 'api')));
             $this->element('setting', array('name' => 'OAuth'),
                            'true');
             $this->elementEnd('settings');