summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-10 17:56:11 -0700
committerBrion Vibber <brion@pobox.com>2010-04-10 17:56:11 -0700
commit1eeb23e1e3b77de056791a74cd3e4f5c02d68510 (patch)
treea636518ebfc9bf41c2b0b0a916c14f1ee37df634
parentaf06c554a0d8c4eeab801a9550d951845d40350a (diff)
parentedd883d3b009788049a9326bd6bdcc7846f87a8a (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts: actions/confirmaddress.php
-rw-r--r--actions/groupmembers.php4
-rw-r--r--actions/peopletag.php4
-rw-r--r--actions/subscribers.php4
-rw-r--r--classes/User.php5
-rw-r--r--lib/deluserqueuehandler.php10
5 files changed, 23 insertions, 4 deletions
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 6d0701239..54f1d8dcd 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -238,9 +238,13 @@ class GroupMemberListItem extends ProfileListItem
function homepageAttributes()
{
+ $aAttrs = parent::linkAttributes();
+
if (common_config('nofollow', 'members')) {
$aAttrs['rel'] = 'nofollow';
}
+
+ return $aAttrs;
}
/**
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 5473bc1bd..7287cfbf9 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -168,9 +168,13 @@ class PeopleTagListItem extends ProfileListItem
function homepageAttributes()
{
+ $aAttrs = parent::linkAttributes();
+
if (common_config('nofollow', 'peopletag')) {
$aAttrs['rel'] = 'nofollow';
}
+
+ return $aAttrs;
}
}
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 6fdf43e2c..2845a498e 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -181,8 +181,12 @@ class SubscribersListItem extends SubscriptionListItem
function homepageAttributes()
{
+ $aAttrs = parent::linkAttributes();
+
if (common_config('nofollow', 'subscribers')) {
$aAttrs['rel'] = 'nofollow';
}
+
+ return $aAttrs;
}
}
diff --git a/classes/User.php b/classes/User.php
index 2c256301c..1928a3c62 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -548,7 +548,10 @@ class User extends Memcached_DataObject
return false;
}
- Subscription::cancel($other, $this->getProfile());
+ $self = $this->getProfile();
+ if (Subscription::exists($other, $self)) {
+ Subscription::cancel($other, $self);
+ }
$block->query('COMMIT');
diff --git a/lib/deluserqueuehandler.php b/lib/deluserqueuehandler.php
index 4a1233a5e..710303938 100644
--- a/lib/deluserqueuehandler.php
+++ b/lib/deluserqueuehandler.php
@@ -49,9 +49,13 @@ class DelUserQueueHandler extends QueueHandler
return true;
}
- if (!$user->hasRole(Profile_role::DELETED)) {
- common_log(LOG_INFO, "User {$user->nickname} is not pending deletion; aborting.");
- return true;
+ try {
+ if (!$user->hasRole(Profile_role::DELETED)) {
+ common_log(LOG_INFO, "User {$user->nickname} is not pending deletion; aborting.");
+ return true;
+ }
+ } catch (UserNoProfileException $unp) {
+ common_log(LOG_INFO, "Deleting user {$user->nickname} with no profile... probably a good idea!");
}
$notice = $this->getNextBatch($user);