summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-22 10:41:54 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-22 10:41:54 -0400
commitab1f2ff9d07088c7a3607ee6d05b1042d735960d (patch)
tree8b9811c2997b0bc19ae02a5d576fe74e5994aad6
parent5f79bcdf51e0cbc17f62c6899207813f26a29214 (diff)
every user is subscribed to themselves
darcs-hash:20080722144154-84dde-80beabad9a681f2e12edb34ceb4ac249f4ce6705.gz
-rw-r--r--actions/register.php14
-rw-r--r--actions/showstream.php2
-rw-r--r--actions/subscribers.php1
-rw-r--r--actions/subscriptions.php1
4 files changed, 18 insertions, 0 deletions
diff --git a/actions/register.php b/actions/register.php
index 0832b0847..6ac283059 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 bccdd3cc8..87858e14b 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 de2090cf1..2cc82d457 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 e0643e0dc..5566acb41 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() {