Annihilate profile_tag_inbox.

[quix0rs-gnu-social.git] / classes / Subscription_queue.php

diff --git a/classes/Subscription_queue.php b/classes/Subscription_queue.php
index 3e254dfce1dcb732b97a5cbb490b1390c45d566e..19cd71c6a8523a0c0b61bbd86eedcae2708783b5 100644 (file)
--- a/classes/Subscription_queue.php
+++ b/classes/Subscription_queue.php
@@ -72,7 +72,7 @@ class Subscription_queue extends Managed_DataObject
     {
         $subscriber = Profile::staticGet('id', $this->subscriber);
         $subscribed = Profile::staticGet('id', $this->subscribed);
-        $sub = Subscription::start($subscriber, $other, Subscription::FORCE);
+        $sub = Subscription::start($subscriber, $subscribed, Subscription::FORCE);
         if ($sub) {
             $this->delete();
         }
@@ -82,7 +82,7 @@ class Subscription_queue extends Managed_DataObject
     /**
      * Cancel an outstanding subscription request to the other profile.
      */
-    public function abort($profile)
+    public function abort()
     {
         $subscriber = Profile::staticGet('id', $this->subscriber);
         $subscribed = Profile::staticGet('id', $this->subscribed);
@@ -98,8 +98,8 @@ class Subscription_queue extends Managed_DataObject
      */
     public function notify()
     {
-        $subscriber = Profile::staticGet('id', $this->subscriber);
-        $subscribed = Profile::staticGet('id', $this->subscribed);
-        //mail_notify_subscription_pending($subscribed, $subscriber);
+        $other = Profile::staticGet('id', $this->subscriber);
+        $listenee = User::staticGet('id', $this->subscribed);
+        mail_subscribe_pending_notify_profile($listenee, $other);
     }
 }