diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-18 15:21:43 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-18 15:21:43 -0500 |
| commit | dbd44e51a2a9c5c63a6211002e5dd3b14483fb60 (patch) | |
| tree | 56344401c6a541eca0b45ec01201faa9c52ce3f9 /classes/Subscription.php | |
| parent | 2ccd5187ccd509f3f579629186a7087720e5f94a (diff) | |
| parent | f1b3d84b7d55cc7c466982a95815ba1ddf130418 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Subscription.php')
| -rw-r--r-- | classes/Subscription.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Subscription.php b/classes/Subscription.php index 9cef2df1a..5ac95f922 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -105,8 +105,8 @@ class Subscription extends Memcached_DataObject $auto = new Subscription(); - $auto->subscriber = $subscriber->id; - $auto->subscribed = $other->id; + $auto->subscriber = $other->id; + $auto->subscribed = $subscriber->id; $auto->created = common_sql_now(); $result = $auto->insert(); |