From cac9d23498808a60dfb890aef437606e98106a6d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 18 Mar 2010 14:26:32 -0700
Subject: Fix for xmpp/sms notification options appearing to be disabled on new
 subscriptions. Base problem is that our caching-on-insert interferes with
 relying on column default values; the cached object is missing those fields,
 so they appear to be empty (null) when the object is retrieved from cache.
 Now explicitly setting them when inserting subscriptions, and cleaned up some
 code that had alternate code paths.

May also have made auto-subscription work for remote OStatus subscribers, but can't test until magic sigs are working again.
---
 classes/User.php | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'classes/User.php')

diff --git a/classes/User.php b/classes/User.php
index 16c256535..8ad2ec63d 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -153,19 +153,12 @@ class User extends Memcached_DataObject
         return Sms_carrier::staticGet('id', $this->carrier);
     }
 
+    /**
+     * @deprecated use Subscription::start($sub, $other);
+     */
     function subscribeTo($other)
     {
-        $sub = new Subscription();
-        $sub->subscriber = $this->id;
-        $sub->subscribed = $other->id;
-
-        $sub->created = common_sql_now(); // current time
-
-        if (!$sub->insert()) {
-            return false;
-        }
-
-        return true;
+        return Subscription::start($this->getProfile(), $other);
     }
 
     function hasBlocked($other)
@@ -346,17 +339,7 @@ class User extends Memcached_DataObject
                     common_log(LOG_WARNING, sprintf("Default user %s does not exist.", $defnick),
                                __FILE__);
                 } else {
-                    $defsub = new Subscription();
-                    $defsub->subscriber = $user->id;
-                    $defsub->subscribed = $defuser->id;
-                    $defsub->created = $user->created;
-
-                    $result = $defsub->insert();
-
-                    if (!$result) {
-                        common_log_db_error($defsub, 'INSERT', __FILE__);
-                        return false;
-                    }
+                    Subscription::start($user, $defuser);
                 }
             }
 
-- 
cgit v1.2.3