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

Conflicts:
	actions/confirmaddress.php

3 files changed, 12 insertions, 0 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;
     }
 }