Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

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

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index e7caf9686914b7720eeec02dca120ba5856b5119..3997a8b51c4161d48621e0112bb143fe7683903f 100644 (file)
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -100,8 +100,8 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
 
         try {
             Subscription::start($this->scoped, $this->other);
-        } catch (Exception $e) {
-            $this->clientError($e->getMessage(), 403);
+        } catch (AlreadyFulfilledException $e) {
+            $this->clientError($e->getMessage(), 409);
         }
 
         $this->initDocument($this->format);