From a93d0dc16af0438af59d14f8413dabb80c13b707 Mon Sep 17 00:00:00 2001
From: Christopher Vollick <psycotica0@gmail.com>
Date: Fri, 9 Apr 2010 06:03:53 -0400
Subject: Undefined Variable in foafgroup.php

Probably just left over from the past.
---
 actions/foafgroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions')

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index d685554ac..07cca3181 100644
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -56,7 +56,7 @@ class FoafGroupAction extends Action
             return false;
         }
 
-        $local = Local_group::staticGet('nickname', $nickname);
+        $local = Local_group::staticGet('nickname', $this->nickname);
 
         if (!$local) {
             $this->clientError(_('No such group.'), 404);
-- 
cgit v1.2.3-54-g00ecf


From 7baf671570b1190c54c9b7e763fdaf0ab454b6a7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 9 Apr 2010 08:36:13 -0700
Subject: Avoid E_NOTICE spew when listing group members who aren't admins

---
 actions/foafgroup.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actions')

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index 07cca3181..4db40c28b 100644
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -126,7 +126,8 @@ class FoafGroupAction extends Action
         while ($members->fetch()) {
             $member_uri = common_local_url('userbyid', array('id'=>$members->id));
             $member_details[$member_uri] = array(
-                                        'nickname' => $members->nickname
+                                        'nickname' => $members->nickname,
+                                        'is_admin' => false,
                                         );
             $this->element('member', array('rdf:resource' => $member_uri));
         }
-- 
cgit v1.2.3-54-g00ecf


From 4e3fad4f0d20e843cf42c07026ecbdb5a566562a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 9 Apr 2010 14:11:18 -0400
Subject: fix attributes on homepage output

---
 actions/groupmembers.php | 4 ++++
 actions/peopletag.php    | 4 ++++
 actions/subscribers.php  | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'actions')

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index fb4e46dbc..e72ef371a 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -240,9 +240,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 456cc21c4..32652f755 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 6dda7312d..6f1520b3f 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -177,8 +177,12 @@ class SubscribersListItem extends SubscriptionListItem
 
     function homepageAttributes()
     {
+        $aAttrs = parent::linkAttributes();
+
         if (common_config('nofollow', 'subscribers')) {
             $aAttrs['rel'] = 'nofollow';
         }
+
+        return $aAttrs;
     }
 }
-- 
cgit v1.2.3-54-g00ecf