diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-16 20:11:48 +0000 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-16 20:11:48 +0000 |
commit | a116cde1a401b1959515b8e6b512c41603387031 (patch) | |
tree | 860d851a3c410e507463f4ed3e45a1dc1d089c57 /plugins/OStatus | |
parent | eea52c708b4688c9b39f24d3931edc9da2cf1b07 (diff) |
OStatus: fix for low-level remote subscribe
Diffstat (limited to 'plugins/OStatus')
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index b750e1883..9b6ef2f16 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -225,7 +225,7 @@ class Ostatus_profile extends Memcached_DataObject try { $local = $munger->profile(); - if ($entity->isGroup()) { + if ($profile->isGroup()) { $group = new User_group(); $group->nickname = $local->nickname . '@remote'; // @fixme $group->fullname = $local->fullname; @@ -245,17 +245,17 @@ class Ostatus_profile extends Memcached_DataObject $profile->profile_id = $local->id; } - $profile->created = sql_common_date(); - $profile->lastupdate = sql_common_date(); + $profile->created = common_sql_now(); + $profile->lastupdate = common_sql_now(); $result = $profile->insert(); if (empty($result)) { throw new FeedDBException($profile); } - $entity->query('COMMIT'); + $profile->query('COMMIT'); } catch (FeedDBException $e) { common_log_db_error($e->obj, 'INSERT', __FILE__); - $entity->query('ROLLBACK'); + $profile->query('ROLLBACK'); return false; } @@ -269,7 +269,7 @@ class Ostatus_profile extends Memcached_DataObject } } - return $entity; + return $profile; } /** |