eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Working subscription approval!

Browse Source
This commit is contained in:
Brion Vibber
2011-03-28 17:06:02 -07:00
parent a70e68e09c
commit e5b5c256a3
13 changed files with 714 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Subscription_queue.php
View File

@@ -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);