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

Conflicts:
	actions/confirmaddress.php

1 files changed, 4 insertions, 0 deletions

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;
     }
 }