From ab1f2ff9d07088c7a3607ee6d05b1042d735960d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 22 Jul 2008 10:41:54 -0400 Subject: [PATCH] every user is subscribed to themselves darcs-hash:20080722144154-84dde-80beabad9a681f2e12edb34ceb4ac249f4ce6705.gz --- actions/register.php | 14 ++++++++++++++ actions/showstream.php | 2 ++ actions/subscribers.php | 1 + actions/subscriptions.php | 1 + 4 files changed, 18 insertions(+) diff --git a/actions/register.php b/actions/register.php index 0832b08478..6ac2830595 100644 --- a/actions/register.php +++ b/actions/register.php @@ -159,6 +159,20 @@ class RegisterAction extends Action { return FALSE; } + # Everyone is subscribed to themself + + $subscription = new Subscription(); + $subscription->subscriber = $user->id; + $subscription->subscribed = $user->id; + $subscription->created = $user->created; + + $result = $subscription->insert(); + + if (!$result) { + common_log_db_error($subscription, 'INSERT', __FILE__); + return FALSE; + } + if ($email) { $confirm = new Confirm_address(); diff --git a/actions/showstream.php b/actions/showstream.php index bccdd3cc86..87858e14b3 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -205,6 +205,8 @@ class ShowstreamAction extends StreamAction { $subs = DB_DataObject::factory('subscription'); $subs->subscriber = $profile->id; + $subs->whereAdd('subscribed != ' . $profile->id); + $subs->orderBy('created DESC'); # We ask for an extra one to know if we need to do another page diff --git a/actions/subscribers.php b/actions/subscribers.php index de2090cf11..2cc82d4571 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -38,6 +38,7 @@ class SubscribersAction extends GalleryAction { function define_subs(&$subs, &$profile) { $subs->subscribed = $profile->id; + $subs->whereAdd('subscriber != ' . $profile->id); } function div_class() { diff --git a/actions/subscriptions.php b/actions/subscriptions.php index e0643e0dc4..5566acb41d 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -38,6 +38,7 @@ class SubscriptionsAction extends GalleryAction { function define_subs(&$subs, &$profile) { $subs->subscriber = $profile->id; + $subs->whereAdd('subscribed != ' . $profile->id); } function div_class() { -- 2.39.5