diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-17 12:15:12 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-17 12:15:12 -0700 |
| commit | ca5612c451e4dabde107ff2cfbc737a2f69136df (patch) | |
| tree | f404c43fa8583f026f8c9a472141a48be30d4e8e /classes | |
| parent | 22f827134c3be845494bebd76bda9e4a074e710b (diff) | |
| parent | dacd0f3e6df020eda81d60139ac88437fed3352e (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'classes')
| -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(); |