Merge branch 'master' into 0.9.x

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

diff --git a/actions/rsd.php b/actions/rsd.php
index f88bf2e9a8bbfaedd7d33a0748bb0a880ac895d8..e02c85c41b42b2977a15dad2834456d8759f3a15 100644 (file)
--- a/actions/rsd.php
+++ b/actions/rsd.php
@@ -162,6 +162,20 @@ class RsdAction extends Action
                            'true');
             $this->elementEnd('settings');
             $this->elementEnd('api');
+
+            // Atom API
+
+            if (empty($this->user)) {
+                $service = common_local_url('ApiAtomService');
+            } else {
+                $service = common_local_url('ApiAtomService', array('id' => $this->user->nickname));
+            }
+
+            $this->element('api', array('name' => 'Atom',
+                                        'preferred' => 'false',
+                                        'apiLink' => $service,
+                                        'blogID' => $blogID));
+
             Event::handle('EndRsdListApis', array($this, $this->user));
         }
         $this->elementEnd('apis');