GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Browse Source 
Conflicts:
	actions/confirmaddress.php
This commit is contained in:
Brion Vibber 2010-04-10 17:56:11 -07:00
commit 1eeb23e1e3
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/groupmembers.php
View File

@ -238,9 +238,13 @@ class GroupMemberListItem extends ProfileListItem
function homepageAttributes()
{
$aAttrs = parent::linkAttributes();
if (common_config('nofollow', 'members')) {
$aAttrs['rel'] = 'nofollow';
}
return $aAttrs;
}
/**

4
actions/peopletag.php
View File

@ -168,9 +168,13 @@ class PeopleTagListItem extends ProfileListItem
function homepageAttributes()
{
$aAttrs = parent::linkAttributes();
if (common_config('nofollow', 'peopletag')) {
$aAttrs['rel'] = 'nofollow';
}
return $aAttrs;
}
}

4
actions/subscribers.php
View File

@ -181,8 +181,12 @@ class SubscribersListItem extends SubscriptionListItem
function homepageAttributes()
{
$aAttrs = parent::linkAttributes();
if (common_config('nofollow', 'subscribers')) {
$aAttrs['rel'] = 'nofollow';
}
return $aAttrs;
}
}

5
classes/User.php
View File

@ -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');

10
lib/deluserqueuehandler.php
View File

@ -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);