return a 409 Conflict when subscription already exists

2011-01-17 15:57:04 -05:00 · 2011-01-17 15:57:04 -05:00 · 6d429ce357
commit 6d429ce357
parent a2aa87fbff
1 changed files with 8 additions and 0 deletions
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@ -263,6 +263,14 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
                return;
            }

+            if (Subscription::exists($this->_profile, $profile)) {
+                // 409 Conflict
+                $this->clientError(sprintf(_('Already subscribed to %s'),
+                                           $person->id), 
+                                   409);
+                return;
+            }
+
            if (Subscription::start($this->_profile, $profile)) {
                $sub = Subscription::pkeyGet(array('subscriber' => $this->_profile->id,
                                                   'subscribed' => $profile->id));